From 902676ffb3bca6b3087eb7da54acdbc549da5887 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Sun, 2 May 2021 16:15:03 +0530 Subject: [PATCH 001/306] feat: Wiki based desk page --- .../doctype/internal_wiki_page/__init__.py | 0 .../internal_wiki_page/internal_wiki_page.js | 8 + .../internal_wiki_page.json | 87 + .../internal_wiki_page/internal_wiki_page.py | 45 + .../test_internal_wiki_page.py | 10 + frappe/desk/page/wiki/__init__.py | 0 frappe/desk/page/wiki/wiki.js | 15 + frappe/desk/page/wiki/wiki.json | 19 + frappe/public/build.json | 3 + frappe/public/js/frappe/router.js | 4 + frappe/public/js/frappe/views/wiki.js | 426 + .../public/js/frappe/widgets/widget_group.js | 43 + frappe/public/js/frappe/wiki_blocks/blank.js | 111 + frappe/public/js/frappe/wiki_blocks/blocks.js | 23 + frappe/public/js/frappe/wiki_blocks/card.js | 155 + frappe/public/js/frappe/wiki_blocks/chart.js | 156 + .../public/js/frappe/wiki_blocks/paragraph.js | 210 + .../public/js/frappe/wiki_blocks/shortcut.js | 153 + .../js/frappe/wiki_blocks/spacing_tune.js | 554 + frappe/public/scss/desk/index.scss | 1 + frappe/public/scss/desk/wiki.scss | 154 + package.json | 5 + yarn.lock | 16919 ++++++++-------- 23 files changed, 10805 insertions(+), 8296 deletions(-) create mode 100644 frappe/desk/doctype/internal_wiki_page/__init__.py create mode 100644 frappe/desk/doctype/internal_wiki_page/internal_wiki_page.js create mode 100644 frappe/desk/doctype/internal_wiki_page/internal_wiki_page.json create mode 100644 frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py create mode 100644 frappe/desk/doctype/internal_wiki_page/test_internal_wiki_page.py create mode 100644 frappe/desk/page/wiki/__init__.py create mode 100644 frappe/desk/page/wiki/wiki.js create mode 100644 frappe/desk/page/wiki/wiki.json create mode 100644 frappe/public/js/frappe/views/wiki.js create mode 100644 frappe/public/js/frappe/wiki_blocks/blank.js create mode 100644 frappe/public/js/frappe/wiki_blocks/blocks.js create mode 100644 frappe/public/js/frappe/wiki_blocks/card.js create mode 100644 frappe/public/js/frappe/wiki_blocks/chart.js create mode 100644 frappe/public/js/frappe/wiki_blocks/paragraph.js create mode 100644 frappe/public/js/frappe/wiki_blocks/shortcut.js create mode 100644 frappe/public/js/frappe/wiki_blocks/spacing_tune.js create mode 100644 frappe/public/scss/desk/wiki.scss diff --git a/frappe/desk/doctype/internal_wiki_page/__init__.py b/frappe/desk/doctype/internal_wiki_page/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.js b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.js new file mode 100644 index 0000000000..ece4bd5080 --- /dev/null +++ b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.js @@ -0,0 +1,8 @@ +// Copyright (c) 2021, Frappe Technologies and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Internal Wiki Page', { + // refresh: function(frm) { + + // } +}); diff --git a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.json b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.json new file mode 100644 index 0000000000..67180de25e --- /dev/null +++ b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.json @@ -0,0 +1,87 @@ +{ + "actions": [], + "autoname": "field:title", + "creation": "2021-05-02 14:44:26.490935", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "title", + "icon", + "parent_page", + "column_break_4", + "sequence_id", + "private", + "section_break_7", + "content" + ], + "fields": [ + { + "fieldname": "title", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Title", + "reqd": 1, + "unique": 1 + }, + { + "fieldname": "icon", + "fieldtype": "Data", + "label": "Icon" + }, + { + "fieldname": "parent_page", + "fieldtype": "Data", + "label": "Parent Page" + }, + { + "fieldname": "column_break_4", + "fieldtype": "Column Break" + }, + { + "fieldname": "sequence_id", + "fieldtype": "Int", + "in_list_view": 1, + "label": "Sequence Id" + }, + { + "default": "0", + "fieldname": "private", + "fieldtype": "Check", + "label": "Private" + }, + { + "fieldname": "section_break_7", + "fieldtype": "Section Break" + }, + { + "fieldname": "content", + "fieldtype": "Long Text", + "label": "Content" + } + ], + "index_web_pages_for_search": 1, + "links": [], + "modified": "2021-05-02 16:06:35.033197", + "modified_by": "Administrator", + "module": "Desk", + "name": "Internal Wiki Page", + "owner": "Administrator", + "permissions": [ + { + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "share": 1, + "write": 1 + } + ], + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1 +} \ No newline at end of file diff --git a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py new file mode 100644 index 0000000000..ea9a3a4dc5 --- /dev/null +++ b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py @@ -0,0 +1,45 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2021, Frappe Technologies and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe, json +from frappe import _ +from frappe.model.document import Document + +class InternalWikiPage(Document): + + def before_insert(self): + if frappe.db.count('Internal Wiki Page') == 0: + self.sequence_id = 1 + else: + self.sequence_id = frappe.get_last_doc('Internal Wiki Page').sequence_id + 1 + +@frappe.whitelist() +def save_wiki_page(title, parent, blocks, save=True): + if save: + if not frappe.db.exists("Workspace", title): + wspace = frappe.new_doc('Workspace') + wspace.label = title + wspace.insert() + + doc = frappe.new_doc('Internal Wiki Page') + doc.title = title + doc.parent_page = parent + doc.content = blocks + doc.insert() + else: + doc = frappe.get_doc('Internal Wiki Page', title) + doc.content = blocks + doc.save() + + return doc.title + +@frappe.whitelist() +def get_page_content(page): + return frappe.db.get_value("Internal Wiki Page", page, "content") + +@frappe.whitelist() +def get_pages(): + return frappe.db.get_list('Internal Wiki Page', fields=['name', 'icon', 'private', 'parent_page', 'sequence_id'], + order_by="sequence_id asc") \ No newline at end of file diff --git a/frappe/desk/doctype/internal_wiki_page/test_internal_wiki_page.py b/frappe/desk/doctype/internal_wiki_page/test_internal_wiki_page.py new file mode 100644 index 0000000000..85623ad41a --- /dev/null +++ b/frappe/desk/doctype/internal_wiki_page/test_internal_wiki_page.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2021, Frappe Technologies and Contributors +# See license.txt +from __future__ import unicode_literals + +# import frappe +import unittest + +class TestInternalWikiPage(unittest.TestCase): + pass diff --git a/frappe/desk/page/wiki/__init__.py b/frappe/desk/page/wiki/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/desk/page/wiki/wiki.js b/frappe/desk/page/wiki/wiki.js new file mode 100644 index 0000000000..81ff2a7fa2 --- /dev/null +++ b/frappe/desk/page/wiki/wiki.js @@ -0,0 +1,15 @@ +frappe.provide('frappe.views') + +frappe.pages['wiki'].on_page_load = function(wrapper) { + frappe.ui.make_app_page({ + parent: wrapper, + name: "Wiki", + single_column: false, + }); + + frappe.wiki = new frappe.views.Wiki(wrapper); + + $(wrapper).bind('show', function () { + frappe.wiki.show(); + }); +} diff --git a/frappe/desk/page/wiki/wiki.json b/frappe/desk/page/wiki/wiki.json new file mode 100644 index 0000000000..f886264e1c --- /dev/null +++ b/frappe/desk/page/wiki/wiki.json @@ -0,0 +1,19 @@ +{ + "content": null, + "creation": "2021-05-02 14:50:05.327302", + "docstatus": 0, + "doctype": "Page", + "idx": 0, + "modified": "2021-05-02 14:50:05.327302", + "modified_by": "Administrator", + "module": "Desk", + "name": "wiki", + "owner": "Administrator", + "page_name": "wiki", + "roles": [], + "script": null, + "standard": "Yes", + "style": null, + "system_page": 0, + "title": "Wiki" +} \ No newline at end of file diff --git a/frappe/public/build.json b/frappe/public/build.json index 942871ee9b..4536e1d4bc 100755 --- a/frappe/public/build.json +++ b/frappe/public/build.json @@ -178,6 +178,7 @@ "public/js/frappe/views/breadcrumbs.js", "public/js/frappe/views/factory.js", "public/js/frappe/views/pageview.js", + "public/js/frappe/views/wiki.js", "public/js/frappe/ui/toolbar/awesome_bar.js", "public/js/frappe/ui/toolbar/energy_points_notifications.js", @@ -196,6 +197,8 @@ "public/js/frappe/widgets/widget_group.js", + "public/js/frappe/wiki_blocks/blocks.js", + "public/js/frappe/ui/sort_selector.html", "public/js/frappe/ui/sort_selector.js", diff --git a/frappe/public/js/frappe/router.js b/frappe/public/js/frappe/router.js index 5378294855..bf1f0c561f 100644 --- a/frappe/public/js/frappe/router.js +++ b/frappe/public/js/frappe/router.js @@ -119,6 +119,7 @@ frappe.router = { convert_to_standard_route(route) { // /app/settings = ["Workspaces", "Settings"] + // /app/wiki/accounting = ["wiki", "Accounting"] // /app/user = ["List", "User"] // /app/user/view/report = ["List", "User", "Report"] // /app/user/view/tree = ["Tree", "User"] @@ -129,6 +130,9 @@ frappe.router = { if (frappe.workspaces[route[0]]) { // workspace route = ['Workspaces', frappe.workspaces[route[0]].name]; + } else if (frappe.wiki_pages && frappe.wiki_pages[route[1]]) { + // wiki-pages + route = ['wiki', frappe.wiki_pages[route[1]].name]; } else if (this.routes[route[0]]) { // route route = this.set_doctype_route(route); diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js new file mode 100644 index 0000000000..df62fe2039 --- /dev/null +++ b/frappe/public/js/frappe/views/wiki.js @@ -0,0 +1,426 @@ +import EditorJS from '@editorjs/editorjs'; +import Header from '@editorjs/header'; +import Checklist from '@editorjs/checklist'; +import List from '@editorjs/list'; +import Undo from 'editorjs-undo'; + +frappe.views.Wiki = class Wiki { + constructor(wrapper) { + this.wrapper = $(wrapper); + this.page = wrapper.page; + this.pages = {}; + this.sections = {}; + this.sidebar_items = {}; + this.sorted_sidebar_items = {} + this.tools = {} + this.isReadOnly = true; + this.prepare_container(); + this.setup_wiki_pages(); + } + + prepare_container() { + let list_sidebar = $(` + + `).appendTo(this.wrapper.find(".layout-side-section")); + this.sidebar = list_sidebar.find(".desk-sidebar"); + this.body = this.wrapper.find(".layout-main-section"); + // this.body.addClass("frappe-card"); + } + + setup_wiki_pages() { + this.get_pages().then(() => { + if(this.all_pages) { + frappe.wiki_pages = {}; + let root_pages = this.all_pages.filter(page => page.parent_page == '' || page.parent_page == null) + for (let page of this.all_pages || []) { + frappe.wiki_pages[frappe.router.slug(page.name)] = page; + } + frappe.router.route(); + this.make_sidebar(root_pages); + this.make_sidebar_sortable(); + } + }) + } + + make_sidebar_sortable() { + let me = this; + this.sidebar_sortable = Sortable.create(this.page.sidebar.find(".standard-sidebar-section").get(0), { + handle: ".standard-sidebar-item-container", + draggable: ".standard-sidebar-item-container", + animation: 150, + onEnd: function (evt){ + // let sb_items = me.all_pages.filter(page => page.parent_page == '' || page.parent_page == null) + // let startBlock = sb_items[evt.oldIndex]; + // let endBlock = sb_items[evt.newIndex]; + // startBlock.sequence_id = parseInt(me.sidebar.find('.standard-sidebar-item-container')[evt.oldIndex].getAttribute('item-sequence')); + // let oldName = me.sidebar.find('.standard-sidebar-item-container')[evt.oldIndex].getAttribute('item-name'); + // endBlock.sequence_id = parseInt(me.sidebar.find('.standard-sidebar-item-container')[evt.newIndex].getAttribute('item-sequence')); + // let newName = me.sidebar.find('.standard-sidebar-item-container')[evt.newIndex].getAttribute('item-name'); + // frappe.db.set_value('Internal Wiki Page', newName, {["sequence_id"]: startBlock.sequence_id}) + // frappe.db.set_value('Internal Wiki Page', oldName, {["sequence_id"]: endBlock.sequence_id}) + } + }); + } + + get_pages() { + return frappe.xcall("frappe.desk.doctype.internal_wiki_page.internal_wiki_page.get_pages").then(data => { + this.all_pages = data; + }); + } + + make_sidebar(items) { + if (this.sidebar.find('.standard-sidebar-section')[0]) { + this.sidebar.find('.standard-sidebar-section')[0].remove() + } + let sidebar_section = $(`
`); + + const get_sidebar_item = function (item) { + return $(` +
+
+ + ${frappe.utils.icon(item.icon || "folder-normal", "md")} + ${item.label || item.name} + + +
+ +
+ `); + }; + + const make_sidebar_category_item = item => { + if (item.name == this.get_page_to_show()) { + item.selected = true; + this.current_page_name = item.name; + } + + const get_child_item = function (item) { + return $(` +
+ + ${frappe.utils.icon(item.icon || "folder-normal", "md")} + ${item.label || item.name} + +
+ `); + } + + const make_sidebar_child_item = item => { + let $child_item = get_child_item(item); + $child_item.appendTo(child_item_section) + this.sidebar_items[item.name] = $child_item; + } + + let $item = get_sidebar_item(item); + let drop_icon = $item.find('.drop-icon').get(0); + let child_item_section = $item.find('.sidebar-child-item').get(0); + if(this.all_pages.some(e => e.parent_page == item.name)) { + drop_icon.classList.remove('hidden'); + drop_icon.addEventListener('click', () => { + child_item_section.classList.toggle("hidden"); + }); + } + + let child_items = this.all_pages.filter(page => page.parent_page == item.name) + child_items.forEach(item => make_sidebar_child_item(item)); + + $item.appendTo(sidebar_section); + this.sidebar_items[item.name] = $item; + }; + + items.forEach(item => make_sidebar_category_item(item)); + + sidebar_section.appendTo(this.sidebar); + } + + show() { + if (!this.all_pages) { + // pages not yet loaded, call again after a bit + setTimeout(() => { + this.show(); + }, 500); + return; + } + let page = this.get_page_to_show(); + this.page.set_title(`${__(page)}`); + this.show_page(page); + this.get_content(page).then(() => { + this.get_data(page).then(() => { + if(this.content){ + this.tools = { + header: { + class: Header, + inlineToolbar: true + }, + paragraph: { + class: frappe.wiki_block.blocks['paragraph'], + inlineToolbar: true + }, + checklist: { + class: Checklist, + inlineToolbar: true, + }, + list: { + class: List, + inlineToolbar: true, + }, + chart: { + class: frappe.wiki_block.blocks['chart'], + config: { + page_data: this.page_data || [] + } + }, + card: { + class: frappe.wiki_block.blocks['card'], + config: { + page_data: this.page_data || [] + } + }, + shortcut: { + class: frappe.wiki_block.blocks['shortcut'], + config: { + page_data: this.page_data || [] + } + }, + blank: frappe.wiki_block.blocks['blank'], + spacingTune: frappe.wiki_block.tunes['spacing_tune'], + } + if(this.editor) { + this.editor.isReady.then(() => { + this.editor.configuration.tools.chart.config.page_data = this.page_data; + this.editor.configuration.tools.shortcut.config.page_data = this.page_data; + this.editor.configuration.tools.card.config.page_data = this.page_data; + this.editor.render({ + blocks: JSON.parse(this.content) || [] + }) + }) + } else { + this.initialize_editorjs(JSON.parse(this.content)); + } + } + }) + }) + } + + get_content(page) { + return frappe.xcall("frappe.desk.doctype.internal_wiki_page.internal_wiki_page.get_page_content", { + page: page + }).then(data => { + this.content = data; + }); + } + + get_data(page) { + return frappe.xcall("frappe.desk.desktop.get_desktop_page", { + page: page + }).then(data => { + this.page_data = data; + }); + } + + get_page_to_show() { + let default_page; + + if (localStorage.current_wiki_page) { + default_page = localStorage.current_wiki_page; + } else if (this.all_pages) { + default_page = this.all_pages[0].name; + } else { + default_page = "Home"; + } + + let page = frappe.get_route()[1] || default_page; + return page; + } + + show_page(page) { + if (this.current_page_name && this.pages[this.current_page_name]) { + this.pages[this.current_page_name].hide(); + } + + if (this.sidebar_items && this.sidebar_items[this.current_page_name]) { + this.sidebar_items[this.current_page_name][0].firstElementChild.classList.remove("selected"); + this.sidebar_items[page][0].firstElementChild.classList.add("selected"); + } + this.current_page_name = page; + localStorage.current_wiki_page = page; + + this.current_page = this.pages[page]; + + if (!this.body.find('#editorjs')[0]) { + this.$page = $(` +
+ `).appendTo(this.body); + } + + this.setup_actions(); + } + + setup_actions() { + this.page.clear_inner_toolbar(); + + this.page.set_secondary_action( + __("Customize"), + () => { + this.isReadOnly = false; + this.editor.readOnly.toggle(); + this.editor.isReady + .then(() => { + let me = this; + this.undo = new Undo({ editor: this.editor }); + this.undo.initialize({blocks: JSON.parse(this.content)}); + this.setup_customization_buttons(); + this.page_sortable = Sortable.create(this.page.main.find(".codex-editor__redactor").get(0), { + handle: ".ce-block", + animation: 150, + onEnd: function (evt){ + me.editor.blocks.move(evt.newIndex, evt.oldIndex); + }, + setData: function (dataTransfer, dragEl) { + //Do Nothing + } + }); + }) + }, + ); + + this.page.add_inner_button(__('Create Page'), () => { + this.initialize_new_page(); + }); + } + + setup_customization_buttons() { + this.page.clear_primary_action(); + this.page.clear_secondary_action(); + this.page.clear_inner_toolbar(); + + this.page.set_primary_action( + __("Save Customizations"), + () => { + this.page.clear_primary_action(); + this.page.clear_secondary_action(); + this.save_page(); + this.editor.readOnly.toggle(); + this.isReadOnly = true; + this.page_sortable.option("disabled", true); + }, + null, + __("Saving") + ); + + this.page.set_secondary_action( + __("Discard"), + () => { + this.page.clear_primary_action(); + this.page.clear_secondary_action(); + this.editor.readOnly.toggle(); + this.isReadOnly = true; + this.page_sortable.option("disabled", true); + this.reload(); + frappe.show_alert({ message: __("Customizations Discarded"), indicator: "info" }); + } + ); + } + + initialize_new_page() { + const d = new frappe.ui.Dialog({ + title: __('Set Title'), + fields: [ + { label: __('Title'), fieldtype: 'Data', fieldname: 'title'}, + { label: __('Parent'), fieldtype: 'Select', fieldname: 'parent', options: this.all_pages.map(pages => pages.name)} + ], + primary_action_label: __('Create'), + primary_action: (values) => { + d.hide(); + this.setup_customization_buttons(); + this.title = values.title; + this.parent = values.parent; + // const index = this.all_pages.findIndex(e => e.selected == true ) + // this.all_pages[index].selected = false; + // let item = {name: this.title, selected: true} + // this.make_sidebar([...this.all_pages, item], 'new') + this.editor.render({ + blocks: [ + { + type: "header", + data: { + text: this.title, + level: 2 + } + } + ] + }).then(() => { + if(this.editor.configuration.readOnly) { + this.isReadOnly = false; + this.editor.readOnly.toggle(); + } + this.dirty = false; + }) + } + }); + d.show(); + } + + initialize_editorjs(blocks) { + this.dirty = false; + const data = { + blocks: blocks || [] + } + this.editor = new EditorJS({ + tools: this.tools, + autofocus: false, + data, + tunes: ['spacingTune'], + onChange: () => { + this.dirty = true; + }, + readOnly: true, + }); + } + + save_page() { + frappe.dom.freeze(); + let save = true; + if (!this.title && this.current_page_name) { + this.title = this.current_page_name; + save = ''; + } + let me = this; + this.editor.save().then((outputData) => { + frappe.call({ + method: "frappe.desk.doctype.internal_wiki_page.internal_wiki_page.save_wiki_page", + args: { + title: me.title, + parent: me.parent || '', + blocks: JSON.stringify(outputData.blocks), + save: save + }, + callback: function(res) { + frappe.dom.unfreeze(); + if (res.message) { + frappe.show_alert({ message: __("Page Saved Successfully"), indicator: "green" }); + me.title = ''; + me.parent = ''; + me.reload(); + } + } + }); + }).catch((error) => { + console.log('Saving failed: ', error); + }); + } + + reload() { + this.setup_wiki_pages(); + this.dirty = false; + } +} diff --git a/frappe/public/js/frappe/widgets/widget_group.js b/frappe/public/js/frappe/widgets/widget_group.js index 20a8e14540..d1a5e3013c 100644 --- a/frappe/public/js/frappe/widgets/widget_group.js +++ b/frappe/public/js/frappe/widgets/widget_group.js @@ -186,4 +186,47 @@ export default class WidgetGroup { } } +export class SingleWidgetGroup { + constructor(opts) { + Object.assign(this, opts); + this.widgets_list = []; + this.widgets_dict = {}; + this.widget_order = []; + this.make(); + } + + make() { + this.add_widget(this.widgets); + } + + add_widget(widget) { + let widget_object = frappe.widget.make_widget({ + ...widget, + widget_type: this.type, + container: this.container, + height: this.height || null, + options: { + ...this.options, + on_delete: (name) => this.on_delete(name), + }, + }); + + this.widgets_list.push(widget_object); + this.widgets_dict[widget.name] = widget_object; + + return widget_object; + } + + customize() { + // if (!this.hidden) this.widget_area.show(); + this.widgets_list.forEach((wid) => { + wid.customize(this.options); + }); + + // this.options.allow_create && this.setup_new_widget(); + // this.options.allow_sorting && this.setup_sortable(); + } +} + frappe.widget.WidgetGroup = WidgetGroup; +frappe.widget.SingleWidgetGroup = SingleWidgetGroup; diff --git a/frappe/public/js/frappe/wiki_blocks/blank.js b/frappe/public/js/frappe/wiki_blocks/blank.js new file mode 100644 index 0000000000..fa1a950280 --- /dev/null +++ b/frappe/public/js/frappe/wiki_blocks/blank.js @@ -0,0 +1,111 @@ +export default class Blank { + static get toolbox() { + return { + title: 'Blank', + icon: '' + }; + } + + static get isReadOnlySupported() { + return true; + } + + constructor({data, api, config, readOnly}){ + this.data = data; + this.api = api; + this.config = config; + this.readOnly = readOnly; + this.col = this.data.col ? this.data.col : "12", + this.pt = this.data.pt ? this.data.pt : "0", + this.pr = this.data.pr ? this.data.pr : "0", + this.pb = this.data.pb ? this.data.pb : "0", + this.pl = this.data.pl ? this.data.pl : "0" + } + + render() { + this.wrapper = document.createElement('div'); + if (!this.readOnly) { + this.wrapper.innerText = 'Blank'; + this.wrapper.classList.add('widget', 'new-widget'); + this.wrapper.style.minHeight = 50 + 'px'; + } + return this.wrapper; + } + + save(blockContent) { + return { + col: this._getCol(), + pt: this._getPadding("t"), + pr: this._getPadding("r"), + pb: this._getPadding("b"), + pl: this._getPadding("l") + } + } + + rendered() { + var e = this.wrapper.parentNode.parentNode; + e.classList.add("col-" + this.col) + e.classList.add("pt-" + this.pt) + e.classList.add("pr-" + this.pr) + e.classList.add("pb-" + this.pb) + e.classList.add("pl-" + this.pl) + } + + _getCol() { + var e = 12, + t = "col-12", + n = this.wrapper.parentNode.parentNode, + r = new RegExp(/\bcol-.+?\b/, "g"); + if (n.className.match(r)) { + n.classList.forEach(function (e) { + e.match(r) && (t = e); + }); + var a = t.split("-"); + e = parseInt(a[1]); + } + return e; + } + + _getPadding() { + var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l", + t = 0, + n = "p" + e + "-0", + r = this.wrapper.parentNode.parentNode, + a = new RegExp(/\pl-.+?\b/, "g"), + i = new RegExp(/\pr-.+?\b/, "g"), + o = new RegExp(/\pt-.+?\b/, "g"), + c = new RegExp(/\pb-.+?\b/, "g"); + if ("l" == e) { + if (r.className.match(a)) { + r.classList.forEach(function (e) { + e.match(a) && (n = e); + }); + var s = n.split("-"); + t = parseInt(s[1]); + } + } else if ("r" == e) { + if (r.className.match(i)) { + r.classList.forEach(function (e) { + e.match(i) && (n = e); + }); + var l = n.split("-"); + t = parseInt(l[1]); + } + } else if ("t" == e) { + if (r.className.match(o)) { + r.classList.forEach(function (e) { + e.match(o) && (n = e); + }); + var u = n.split("-"); + t = parseInt(u[1]); + } + } else if ("b" == e && r.className.match(c)) { + r.classList.forEach(function (e) { + e.match(c) && (n = e); + }); + var p = n.split("-"); + t = parseInt(p[1]); + } + return t; + } +} \ No newline at end of file diff --git a/frappe/public/js/frappe/wiki_blocks/blocks.js b/frappe/public/js/frappe/wiki_blocks/blocks.js new file mode 100644 index 0000000000..1b556eeaee --- /dev/null +++ b/frappe/public/js/frappe/wiki_blocks/blocks.js @@ -0,0 +1,23 @@ +// import blocks +import Paragraph from "../wiki_blocks/paragraph"; +import Card from "../wiki_blocks/card"; +import Chart from "../wiki_blocks/chart"; +import Shortcut from "../wiki_blocks/shortcut"; +import Blank from "../wiki_blocks/blank"; + +// import tunes +import SpacingTune from "../wiki_blocks/spacing_tune"; + +frappe.provide("frappe.wiki_block"); + +frappe.wiki_block.blocks = { + paragraph: Paragraph, + card: Card, + chart: Chart, + shortcut: Shortcut, + blank: Blank, +}; + +frappe.wiki_block.tunes = { + spacing_tune : SpacingTune +} \ No newline at end of file diff --git a/frappe/public/js/frappe/wiki_blocks/card.js b/frappe/public/js/frappe/wiki_blocks/card.js new file mode 100644 index 0000000000..12061e2d02 --- /dev/null +++ b/frappe/public/js/frappe/wiki_blocks/card.js @@ -0,0 +1,155 @@ +export default class Card { + static get toolbox() { + return { + title: 'Card', + icon: '' + }; + } + + static get isReadOnlySupported() { + return true; + } + + constructor({data, api, config, readOnly, block}){ + this.data = data; + this.api = api; + this.config = config; + this.readOnly = readOnly; + this.sections = {}; + this.col = this.data.col ? this.data.col : "12", + this.pt = this.data.pt ? this.data.pt : "0", + this.pr = this.data.pr ? this.data.pr : "0", + this.pb = this.data.pb ? this.data.pb : "0", + this.pl = this.data.pl ? this.data.pl : "0" + } + + render() { + let me = this; + this.wrapper = document.createElement('div'); + this._make_fieldgroup(this.wrapper, [{ + fieldtype: "Select", + label: "Card Name", + fieldname: "card_name", + options: this.config.page_data.cards.items.map(({ label }) => label), + change: function() { + if (this.value) { + me._make_cards(this.value) + } + } + }]); + if (this.data && this.data.card_name) { + this._make_cards(this.data.card_name) + } + return this.wrapper; + } + + save(blockContent) { + return { + card_name: blockContent.getAttribute('card_name'), + col: this._getCol(), + pt: this._getPadding("t"), + pr: this._getPadding("r"), + pb: this._getPadding("b"), + pl: this._getPadding("l") + } + } + + rendered() { + var e = this.wrapper.parentNode.parentNode; + e.classList.add("col-" + this.col) + e.classList.add("pt-" + this.pt) + e.classList.add("pr-" + this.pr) + e.classList.add("pb-" + this.pb) + e.classList.add("pl-" + this.pl) + } + + _getCol() { + var e = 12, + t = "col-12", + n = this.wrapper.parentNode.parentNode, + r = new RegExp(/\bcol-.+?\b/, "g"); + if (n.className.match(r)) { + n.classList.forEach(function (e) { + e.match(r) && (t = e); + }); + var a = t.split("-"); + e = parseInt(a[1]); + } + return e; + } + + _getPadding() { + var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l", + t = 0, + n = "p" + e + "-0", + r = this.wrapper.parentNode.parentNode, + a = new RegExp(/\pl-.+?\b/, "g"), + i = new RegExp(/\pr-.+?\b/, "g"), + o = new RegExp(/\pt-.+?\b/, "g"), + c = new RegExp(/\pb-.+?\b/, "g"); + if ("l" == e) { + if (r.className.match(a)) { + r.classList.forEach(function (e) { + e.match(a) && (n = e); + }); + var s = n.split("-"); + t = parseInt(s[1]); + } + } else if ("r" == e) { + if (r.className.match(i)) { + r.classList.forEach(function (e) { + e.match(i) && (n = e); + }); + var l = n.split("-"); + t = parseInt(l[1]); + } + } else if ("t" == e) { + if (r.className.match(o)) { + r.classList.forEach(function (e) { + e.match(o) && (n = e); + }); + var u = n.split("-"); + t = parseInt(u[1]); + } + } else if ("b" == e && r.className.match(c)) { + r.classList.forEach(function (e) { + e.match(c) && (n = e); + }); + var p = n.split("-"); + t = parseInt(p[1]); + } + return t; + } + + _make_fieldgroup(parent, ddf_list) { + this.card_field = new frappe.ui.FieldGroup({ + "fields": ddf_list, + "parent": parent + }); + this.card_field.make(); + } + + _make_cards(card_name) { + let card = this.config.page_data.cards.items.find(obj => { + return obj.label == card_name + }); + this.wrapper.innerHTML = ''; + this.sections = {}; + let cards = new frappe.widget.SingleWidgetGroup({ + container: this.wrapper, + type: "links", + columns: 3, + options: { + allow_sorting: this.allow_customization, + allow_create: false, + allow_delete: false, + allow_hiding: this.allow_customization, + allow_edit: false, + }, + widgets: card + }); + + this.sections["cards"] = cards; + this.wrapper.setAttribute("card_name", card_name); + } +} \ No newline at end of file diff --git a/frappe/public/js/frappe/wiki_blocks/chart.js b/frappe/public/js/frappe/wiki_blocks/chart.js new file mode 100644 index 0000000000..054e8d1c12 --- /dev/null +++ b/frappe/public/js/frappe/wiki_blocks/chart.js @@ -0,0 +1,156 @@ +export default class Chart { + static get toolbox() { + return { + title: 'Chart', + icon: '' + }; + } + + static get isReadOnlySupported() { + return true; + } + + constructor({data, api, config, readOnly}){ + this.data = data; + this.api = api; + this.config = config; + this.readOnly = readOnly; + this.sections = {}; + this.col = this.data.col ? this.data.col : "12", + this.pt = this.data.pt ? this.data.pt : "0", + this.pr = this.data.pr ? this.data.pr : "0", + this.pb = this.data.pb ? this.data.pb : "0", + this.pl = this.data.pl ? this.data.pl : "0" + } + + render() { + let me = this; + this.wrapper = document.createElement('div'); + this._make_fieldgroup(this.wrapper, [{ + fieldtype: "Select", + label: "Chart Name", + fieldname: "chart_name", + options: this.config.page_data.charts.items.map(({ chart_name }) => chart_name), + change: function() { + if (this.value) { + me._make_charts(this.value) + } + } + }]); + if (this.data && this.data.chart_name) { + this._make_charts(this.data.chart_name) + } + return this.wrapper; + } + + save(blockContent) { + return { + chart_name: blockContent.getAttribute('chart_name'), + col: this._getCol(), + pt: this._getPadding("t"), + pr: this._getPadding("r"), + pb: this._getPadding("b"), + pl: this._getPadding("l") + } + } + + rendered() { + var e = this.wrapper.parentNode.parentNode; + e.classList.add("col-" + this.col) + e.classList.add("pt-" + this.pt) + e.classList.add("pr-" + this.pr) + e.classList.add("pb-" + this.pb) + e.classList.add("pl-" + this.pl) + } + + _getCol() { + var e = 12, + t = "col-12", + n = this.wrapper.parentNode.parentNode, + r = new RegExp(/\bcol-.+?\b/, "g"); + if (n.className.match(r)) { + n.classList.forEach(function (e) { + e.match(r) && (t = e); + }); + var a = t.split("-"); + e = parseInt(a[1]); + } + return e; + } + + _getPadding() { + var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l", + t = 0, + n = "p" + e + "-0", + r = this.wrapper.parentNode.parentNode, + a = new RegExp(/\pl-.+?\b/, "g"), + i = new RegExp(/\pr-.+?\b/, "g"), + o = new RegExp(/\pt-.+?\b/, "g"), + c = new RegExp(/\pb-.+?\b/, "g"); + if ("l" == e) { + if (r.className.match(a)) { + r.classList.forEach(function (e) { + e.match(a) && (n = e); + }); + var s = n.split("-"); + t = parseInt(s[1]); + } + } else if ("r" == e) { + if (r.className.match(i)) { + r.classList.forEach(function (e) { + e.match(i) && (n = e); + }); + var l = n.split("-"); + t = parseInt(l[1]); + } + } else if ("t" == e) { + if (r.className.match(o)) { + r.classList.forEach(function (e) { + e.match(o) && (n = e); + }); + var u = n.split("-"); + t = parseInt(u[1]); + } + } else if ("b" == e && r.className.match(c)) { + r.classList.forEach(function (e) { + e.match(c) && (n = e); + }); + var p = n.split("-"); + t = parseInt(p[1]); + } + return t; + } + + _make_fieldgroup(parent, ddf_list) { + this.chart_field = new frappe.ui.FieldGroup({ + "fields": ddf_list, + "parent": parent + }); + this.chart_field.make(); + } + + _make_charts(chart_name) { + let chart = this.config.page_data.charts.items.find(obj => { + return obj.chart_name == chart_name + }); + this.wrapper.innerHTML = ''; + this.sections = {}; + this.sections["charts"] = new frappe.widget.SingleWidgetGroup({ + container: this.wrapper, + type: "chart", + columns: 1, + class_name: "widget-charts", + // hidden: Boolean(this.onboarding_widget), + options: { + allow_sorting: this.allow_customization, + allow_create: this.allow_customization, + allow_delete: this.allow_customization, + allow_hiding: false, + allow_edit: true, + max_widget_count: 2, + }, + widgets: chart + }); + this.wrapper.setAttribute("chart_name", chart_name) + } +} \ No newline at end of file diff --git a/frappe/public/js/frappe/wiki_blocks/paragraph.js b/frappe/public/js/frappe/wiki_blocks/paragraph.js new file mode 100644 index 0000000000..0cab2b9373 --- /dev/null +++ b/frappe/public/js/frappe/wiki_blocks/paragraph.js @@ -0,0 +1,210 @@ +export default class Paragraph { + + static get DEFAULT_PLACEHOLDER() { + return ''; + } + + constructor({data, config, api, readOnly}) { + this.api = api; + this.readOnly = readOnly; + + this._CSS = { + block: this.api.styles.block, + wrapper: 'ce-paragraph' + }; + + if (!this.readOnly) { + this.onKeyUp = this.onKeyUp.bind(this); + } + + this._placeholder = config.placeholder ? config.placeholder : Paragraph.DEFAULT_PLACEHOLDER; + this._data = {}; + this._element = this.drawView(); + this._preserveBlank = config.preserveBlank !== undefined ? config.preserveBlank : false; + + this.data = data; + this.col = this.data.col ? this.data.col : "12", + this.pt = this.data.pt ? this.data.pt : "0", + this.pr = this.data.pr ? this.data.pr : "0", + this.pb = this.data.pb ? this.data.pb : "0", + this.pl = this.data.pl ? this.data.pl : "0" + } + + onKeyUp(e) { + if (e.code !== 'Backspace' && e.code !== 'Delete') { + return; + } + + const {textContent} = this._element; + + if (textContent === '') { + this._element.innerHTML = ''; + } + } + + drawView() { + let div = document.createElement('DIV'); + + div.classList.add(this._CSS.wrapper, this._CSS.block, 'widget'); + div.contentEditable = false; + div.dataset.placeholder = this.api.i18n.t(this._placeholder); + + if (!this.readOnly) { + div.contentEditable = true; + div.addEventListener('keyup', this.onKeyUp); + } + return div; + } + + render() { + return this._element; + } + + merge(data) { + let newData = { + text : this.data.text + data.text + }; + + this.data = newData; + } + + validate(savedData) { + if (savedData.text.trim() === '' && !this._preserveBlank) { + return false; + } + + return true; + } + + save(toolsContent) { + return { + text: toolsContent.innerHTML, + col: this._getCol(), + pt: this._getPadding("t"), + pr: this._getPadding("r"), + pb: this._getPadding("b"), + pl: this._getPadding("l") + }; + } + + rendered() { + var e = this._element.parentNode.parentNode; + e.classList.add("col-" + this.col) + e.classList.add("pt-" + this.pt) + e.classList.add("pr-" + this.pr) + e.classList.add("pb-" + this.pb) + e.classList.add("pl-" + this.pl) + } + + _getCol() { + var e = 12, + t = "col-12", + n = this._element.parentNode.parentNode, + r = new RegExp(/\bcol-.+?\b/, "g"); + if (n.className.match(r)) { + n.classList.forEach(function (e) { + e.match(r) && (t = e); + }); + var a = t.split("-"); + e = parseInt(a[1]); + } + return e; + } + + _getPadding() { + var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l", + t = 0, + n = "p" + e + "-0", + r = this._element.parentNode.parentNode, + a = new RegExp(/\pl-.+?\b/, "g"), + i = new RegExp(/\pr-.+?\b/, "g"), + o = new RegExp(/\pt-.+?\b/, "g"), + c = new RegExp(/\pb-.+?\b/, "g"); + if ("l" == e) { + if (r.className.match(a)) { + r.classList.forEach(function (e) { + e.match(a) && (n = e); + }); + var s = n.split("-"); + t = parseInt(s[1]); + } + } else if ("r" == e) { + if (r.className.match(i)) { + r.classList.forEach(function (e) { + e.match(i) && (n = e); + }); + var l = n.split("-"); + t = parseInt(l[1]); + } + } else if ("t" == e) { + if (r.className.match(o)) { + r.classList.forEach(function (e) { + e.match(o) && (n = e); + }); + var u = n.split("-"); + t = parseInt(u[1]); + } + } else if ("b" == e && r.className.match(c)) { + r.classList.forEach(function (e) { + e.match(c) && (n = e); + }); + var p = n.split("-"); + t = parseInt(p[1]); + } + return t; + } + + onPaste(event) { + const data = { + text: event.detail.data.innerHTML + }; + + this.data = data; + } + + static get conversionConfig() { + return { + export: 'text', // to convert Paragraph to other block, use 'text' property of saved data + import: 'text' // to covert other block's exported string to Paragraph, fill 'text' property of tool data + }; + } + + static get sanitize() { + return { + text: { + br: true, + } + }; + } + + static get isReadOnlySupported() { + return true; + } + + get data() { + let text = this._element.innerHTML; + + this._data.text = text; + + return this._data; + } + + set data(data) { + this._data = data || {}; + + this._element.innerHTML = this._data.text || ''; + } + + static get pasteConfig() { + return { + tags: [ 'P' ] + }; + } + + static get toolbox() { + return { + icon: '', + title: 'Text' + }; + } +} \ No newline at end of file diff --git a/frappe/public/js/frappe/wiki_blocks/shortcut.js b/frappe/public/js/frappe/wiki_blocks/shortcut.js new file mode 100644 index 0000000000..0cb8de6ef8 --- /dev/null +++ b/frappe/public/js/frappe/wiki_blocks/shortcut.js @@ -0,0 +1,153 @@ +export default class Shortcut { + static get toolbox() { + return { + title: 'Shortcut', + icon: '' + }; + } + + static get isReadOnlySupported() { + return true; + } + + constructor({data, api, config, readOnly}){ + this.data = data; + this.api = api; + this.config = config; + this.readOnly = readOnly; + this.sections = {}; + this.col = this.data.col ? this.data.col : "12", + this.pt = this.data.pt ? this.data.pt : "0", + this.pr = this.data.pr ? this.data.pr : "0", + this.pb = this.data.pb ? this.data.pb : "0", + this.pl = this.data.pl ? this.data.pl : "0" + } + + render() { + let me = this; + this.wrapper = document.createElement('div'); + this._make_fieldgroup(this.wrapper, [{ + fieldtype: "Select", + label: "Shortcut Name", + fieldname: "shortcut_name", + options: this.config.page_data.shortcuts.items.map(({ label }) => label), + change: function() { + if (this.value) { + me._make_shortcuts(this.value); + } + } + }]); + if (this.data && this.data.shortcut_name) { + this._make_shortcuts(this.data.shortcut_name) + } + return this.wrapper; + } + + save(blockContent) { + return { + shortcut_name: blockContent.getAttribute('shortcut_name'), + col: this._getCol(), + pt: this._getPadding("t"), + pr: this._getPadding("r"), + pb: this._getPadding("b"), + pl: this._getPadding("l") + } + } + + rendered() { + var e = this.wrapper.parentNode.parentNode; + e.classList.add("col-" + this.col) + e.classList.add("pt-" + this.pt) + e.classList.add("pr-" + this.pr) + e.classList.add("pb-" + this.pb) + e.classList.add("pl-" + this.pl) + } + + _getCol() { + var e = 12, + t = "col-12", + n = this.wrapper.parentNode.parentNode, + r = new RegExp(/\bcol-.+?\b/, "g"); + if (n.className.match(r)) { + n.classList.forEach(function (e) { + e.match(r) && (t = e); + }); + var a = t.split("-"); + e = parseInt(a[1]); + } + return e; + } + + _getPadding() { + var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l", + t = 0, + n = "p" + e + "-0", + r = this.wrapper.parentNode.parentNode, + a = new RegExp(/\pl-.+?\b/, "g"), + i = new RegExp(/\pr-.+?\b/, "g"), + o = new RegExp(/\pt-.+?\b/, "g"), + c = new RegExp(/\pb-.+?\b/, "g"); + if ("l" == e) { + if (r.className.match(a)) { + r.classList.forEach(function (e) { + e.match(a) && (n = e); + }); + var s = n.split("-"); + t = parseInt(s[1]); + } + } else if ("r" == e) { + if (r.className.match(i)) { + r.classList.forEach(function (e) { + e.match(i) && (n = e); + }); + var l = n.split("-"); + t = parseInt(l[1]); + } + } else if ("t" == e) { + if (r.className.match(o)) { + r.classList.forEach(function (e) { + e.match(o) && (n = e); + }); + var u = n.split("-"); + t = parseInt(u[1]); + } + } else if ("b" == e && r.className.match(c)) { + r.classList.forEach(function (e) { + e.match(c) && (n = e); + }); + var p = n.split("-"); + t = parseInt(p[1]); + } + return t; + } + + _make_fieldgroup(parent, ddf_list) { + this.shortcut_field = new frappe.ui.FieldGroup({ + "fields": ddf_list, + "parent": parent + }); + this.shortcut_field.make(); + } + + _make_shortcuts(shortcut_name) { + let shortcut = this.config.page_data.shortcuts.items.find(obj => { + return obj.label == shortcut_name + }); + this.wrapper.innerHTML = ''; + this.sections = {}; + this.sections["shortcuts"] = new frappe.widget.SingleWidgetGroup({ + container: this.wrapper, + type: "shortcut", + columns: 3, + options: { + allow_sorting: this.allow_customization, + allow_create: this.allow_customization, + allow_delete: this.allow_customization, + allow_hiding: false, + allow_edit: true, + }, + widgets: shortcut + }); + this.wrapper.setAttribute("shortcut_name", shortcut_name); + } +} \ No newline at end of file diff --git a/frappe/public/js/frappe/wiki_blocks/spacing_tune.js b/frappe/public/js/frappe/wiki_blocks/spacing_tune.js new file mode 100644 index 0000000000..494ba2e97a --- /dev/null +++ b/frappe/public/js/frappe/wiki_blocks/spacing_tune.js @@ -0,0 +1,554 @@ +export default class SpacingTune { + static get isTune() { + return true; + } + + constructor({api, settings}) { + this.api = api; + this.settings = settings; + this.CSS = { + button: 'ce-settings__button', + wrapper: 'ce-tune-layout', + sidebar: 'cdx-settings-sidebar', + animation: 'wobble', + }; + this.data = { colWidth: 12, pl: 0, pr: 0, pt: 0, pb: 0 }; + this.wrapper = undefined; + this.sidebar = undefined; + } + + render() { + let me = this; + let layoutWrapper = document.createElement('div'); + layoutWrapper.classList.add(this.CSS.wrapper); + let decreaseWidthButton = document.createElement('div'); + decreaseWidthButton.classList.add(this.CSS.button); + let increaseWidthButton = document.createElement('div'); + increaseWidthButton.classList.add(this.CSS.button); + let paddingButton = document.createElement('div'); + paddingButton.classList.add(this.CSS.button); + + layoutWrapper.appendChild(paddingButton); + layoutWrapper.appendChild(decreaseWidthButton); + layoutWrapper.appendChild(increaseWidthButton); + + // paddingButton.appendChild($.svg('padding', 15, 15)); + paddingButton.innerHTML = ``; + this.api.listeners.on( + paddingButton, + 'click', + (event) => me.showPadding(event, paddingButton), + false + ); + + // decreaseWidthButton.appendChild($.svg('decrease-width', 15, 15)); + decreaseWidthButton.innerHTML = ``; + this.api.listeners.on( + decreaseWidthButton, + 'click', + (event) => me.decreaseWidth(event, decreaseWidthButton), + false + ); + + // increaseWidthButton.appendChild(); + increaseWidthButton.innerHTML = ``; + this.api.listeners.on( + increaseWidthButton, + 'click', + (event) => me.increaseWidth(event, increaseWidthButton), + false + ); + + this.wrapper = layoutWrapper; + return layoutWrapper; + } + + decreaseWidth(event, button) { + const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); + + if (currentBlockIndex < 0) { + return; + } + + let currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); + if (!currentBlock){ + return; + } + + let currentBlockElement = currentBlock.holder; + + // let block = this.api.blocks.getBlock(currentBlockElement); + let className = 'col-12'; + let colClass = new RegExp(/\bcol-.+?\b/, 'g'); + if (currentBlockElement.className.match(colClass)) { + currentBlockElement.classList.forEach( cn => { + if(cn.match(colClass)){ + className = cn; + } + }); + let parts = className.split('-'); + let width = parseInt(parts[1]); + if(width >= 2){ + currentBlockElement.classList.remove('col-'+width); + width = width - 1; + currentBlockElement.classList.add('col-'+width); + } + } + } + + increaseWidth(event, button) { + const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); + + if (currentBlockIndex < 0) { + return; + } + + const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); + if (!currentBlock){ + return; + } + + const currentBlockElement = currentBlock.holder; + + // let block = this.api.blocks.getBlock(currentBlockElement); + let className = 'col-12'; + const colClass = new RegExp(/\bcol-.+?\b/, 'g'); + if (currentBlockElement.className.match(colClass)) { + currentBlockElement.classList.forEach( cn => { + if(cn.match(colClass)){ + className = cn; + } + }); + let parts = className.split('-'); + let width = parseInt(parts[1]); + if(width <= 11){ + currentBlockElement.classList.remove('col-'+width); + width = width + 1; + currentBlockElement.classList.add('col-'+width); + } + } + } + + showPadding(event, button) { + let me = this; + if(button.classList.contains('cdx-settings-button--active')){ + this.sidebar.remove(); + button.classList.remove('cdx-settings-button--active'); + } else { + button.classList.add('cdx-settings-button--active'); + + let sidebarWrapper = document.createElement('div'); + sidebarWrapper.classList.add(this.CSS.sidebar); + + let paddingLeftCaption = document.createElement('button'); + paddingLeftCaption.classList.add(this.CSS.button, 'disabled'); + // paddingLeftCaption.appendChild($.svg('arrow-left', 10, 10)); + paddingLeftCaption.innerHTML = ``; + + let paddingRightCaption = document.createElement('button'); + paddingRightCaption.classList.add(this.CSS.button, 'disabled'); + // paddingRightCaption.appendChild($.svg('arrow-right', 10, 10)); + paddingRightCaption.innerHTML = ``; + + let paddingTopCaption = document.createElement('button'); + paddingTopCaption.classList.add(this.CSS.button, 'disabled'); + // paddingTopCaption.appendChild($.svg('arrow-up', 10, 10)); + paddingTopCaption.innerHTML = ``; + + let paddingBottomCaption = document.createElement('button'); + paddingBottomCaption.classList.add(this.CSS.button, 'disabled'); + // paddingBottomCaption.appendChild($.svg('arrow-down', 10, 10)); + paddingBottomCaption.innerHTML = ``; + + let increasePaddingLeft = document.createElement('button'); + increasePaddingLeft.classList.add(this.CSS.button); + + let decreasePaddingLeft = document.createElement('button'); + decreasePaddingLeft.classList.add(this.CSS.button); + + let increasePaddingRight = document.createElement('button'); + increasePaddingRight.classList.add(this.CSS.button); + + let decreasePaddingRight = document.createElement('button'); + decreasePaddingRight.classList.add(this.CSS.button); + + let increasePaddingTop = document.createElement('button'); + increasePaddingTop.classList.add(this.CSS.button); + + let decreasePaddingTop = document.createElement('button'); + decreasePaddingTop.classList.add(this.CSS.button); + + let increasePaddingBottom = document.createElement('button'); + increasePaddingBottom.classList.add(this.CSS.button); + + let decreasePaddingBottom = document.createElement('button'); + decreasePaddingBottom.classList.add(this.CSS.button); + + this.sidebar = sidebarWrapper; + + // Left Padding + sidebarWrapper.appendChild(paddingLeftCaption); + + // increasePaddingLeft.appendChild($.svg('plus', 15, 15)); + increasePaddingLeft.innerHTML = ``; + + this.api.listeners.on( + increasePaddingLeft, + 'click', + (event) => me.increasePaddingLeft(event, increasePaddingLeft), + false + ); + sidebarWrapper.appendChild(increasePaddingLeft); + + // decreasePaddingLeft.appendChild($.svg('minus', 15, 15)); + decreasePaddingLeft.innerHTML = ``; + + this.api.listeners.on( + decreasePaddingLeft, + 'click', + (event) => me.decreasePaddingLeft(event, decreasePaddingLeft), + false + ); + sidebarWrapper.appendChild(decreasePaddingLeft); + + // Right Padding + sidebarWrapper.appendChild(paddingRightCaption); + // increasePaddingRight.appendChild($.svg('plus', 15, 15)); + increasePaddingRight.innerHTML = ``; + + this.api.listeners.on( + increasePaddingRight, + 'click', + (event) => me.increasePaddingRight(event, increasePaddingRight), + false + ); + sidebarWrapper.appendChild(increasePaddingRight); + + // decreasePaddingRight.appendChild($.svg('minus', 15, 15)); + decreasePaddingRight.innerHTML = ``; + + this.api.listeners.on( + decreasePaddingRight, + 'click', + (event) => me.decreasePaddingRight(event, decreasePaddingRight), + false + ); + sidebarWrapper.appendChild(decreasePaddingRight); + + // Top Padding + sidebarWrapper.appendChild(paddingTopCaption); + // increasePaddingTop.appendChild($.svg('plus', 15, 15)); + increasePaddingTop.innerHTML = ``; + + this.api.listeners.on( + increasePaddingTop, + 'click', + (event) => me.increasePaddingTop(event, increasePaddingTop), + false + ); + sidebarWrapper.appendChild(increasePaddingTop); + + // decreasePaddingTop.appendChild($.svg('minus', 15, 15)); + decreasePaddingTop.innerHTML = ``; + + this.api.listeners.on( + decreasePaddingTop, + 'click', + (event) => me.decreasePaddingTop(event, decreasePaddingTop), + false + ); + sidebarWrapper.appendChild(decreasePaddingTop); + + // Bottom Padding + sidebarWrapper.appendChild(paddingBottomCaption); + // increasePaddingBottom.appendChild($.svg('plus', 15, 15)); + increasePaddingBottom.innerHTML = ``; + + this.api.listeners.on( + increasePaddingBottom, + 'click', + (event) => me.increasePaddingBottom(event, increasePaddingBottom), + false + ); + sidebarWrapper.appendChild(increasePaddingBottom); + + // decreasePaddingBottom.appendChild($.svg('minus', 15, 15)); + decreasePaddingBottom.innerHTML = ``; + + this.api.listeners.on( + decreasePaddingBottom, + 'click', + (event) => me.decreasePaddingBottom(event, decreasePaddingBottom), + false + ); + sidebarWrapper.appendChild(decreasePaddingBottom); + + this.wrapper.appendChild(sidebarWrapper); + } + } + + increasePaddingLeft(event, button) { + const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); + + if(currentBlockIndex < 0){ + return; + } + + const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); + if (!currentBlock){ + return; + } + + const currentBlockElement = currentBlock.holder; + + // let block = this.api.blocks.getBlock(currentBlockElement); + let className = 'pl-0'; + const paddingClass = new RegExp(/\pl-.+?\b/, 'g'); + if (currentBlockElement.className.match(paddingClass)) { + currentBlockElement.classList.forEach( cn => { + if(cn.match(paddingClass)){ + className = cn; + } + }); + let parts = className.split('-'); + let padding = parseInt(parts[1]); + if(padding <= 4){ + currentBlockElement.classList.remove('pl-'+padding); + padding = padding + 1; + currentBlockElement.classList.add('pl-'+padding); + } + } + + } + + decreasePaddingLeft(event, button) { + const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); + + if(currentBlockIndex < 0){ + return; + } + + const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); + if (!currentBlock){ + return; + } + + const currentBlockElement = currentBlock.holder; + + // let block = this.api.blocks.getBlock(currentBlockElement); + let className = 'pl-0'; + const paddingClass = new RegExp(/\pl-.+?\b/, 'g'); + if (currentBlockElement.className.match(paddingClass)) { + currentBlockElement.classList.forEach( cn => { + if(cn.match(paddingClass)){ + className = cn; + } + }); + let parts = className.split('-'); + let padding = parseInt(parts[1]); + if(padding >= 1){ + currentBlockElement.classList.remove('pl-'+padding); + padding = padding - 1; + currentBlockElement.classList.add('pl-'+padding); + } + } + } + + increasePaddingRight(event, button) { + const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); + + if(currentBlockIndex < 0){ + return; + } + + const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); + if (!currentBlock){ + return; + } + + const currentBlockElement = currentBlock.holder; + + // let block = this.api.blocks.getBlock(currentBlockElement); + let className = 'pr-0'; + const paddingClass = new RegExp(/\pr-.+?\b/, 'g'); + if (currentBlockElement.className.match(paddingClass)) { + currentBlockElement.classList.forEach( cn => { + if(cn.match(paddingClass)){ + className = cn; + } + }); + let parts = className.split('-'); + let padding = parseInt(parts[1]); + if(padding <= 4){ + currentBlockElement.classList.remove('pr-'+padding); + padding = padding + 1; + currentBlockElement.classList.add('pr-'+padding); + } + } + } + + decreasePaddingRight(event, button) { + const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); + + if(currentBlockIndex < 0){ + return; + } + + const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); + if (!currentBlock){ + return; + } + + const currentBlockElement = currentBlock.holder; + + // let block = this.api.blocks.getBlock(currentBlockElement); + let className = 'pr-0'; + const paddingClass = new RegExp(/\pr-.+?\b/, 'g'); + if (currentBlockElement.className.match(paddingClass)) { + currentBlockElement.classList.forEach( cn => { + if(cn.match(paddingClass)){ + className = cn; + } + }); + let parts = className.split('-'); + let padding = parseInt(parts[1]); + if(padding >= 1){ + currentBlockElement.classList.remove('pr-'+padding); + padding = padding - 1; + currentBlockElement.classList.add('pr-'+padding); + } + } + } + + increasePaddingTop(event, button) { + const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); + + if(currentBlockIndex < 0){ + return; + } + + const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); + if (!currentBlock){ + return; + } + + const currentBlockElement = currentBlock.holder; + + // let block = this.api.blocks.getBlock(currentBlockElement); + let className = 'pt-0'; + const paddingClass = new RegExp(/\pt-.+?\b/, 'g'); + if (currentBlockElement.className.match(paddingClass)) { + currentBlockElement.classList.forEach( cn => { + if(cn.match(paddingClass)){ + className = cn; + } + }); + let parts = className.split('-'); + let padding = parseInt(parts[1]); + if(padding <= 4){ + currentBlockElement.classList.remove('pt-'+padding); + padding = padding + 1; + currentBlockElement.classList.add('pt-'+padding); + } + } + } + + decreasePaddingTop(event, button) { + const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); + + if(currentBlockIndex < 0){ + return; + } + + const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); + if (!currentBlock){ + return; + } + + const currentBlockElement = currentBlock.holder; + + // let block = this.api.blocks.getBlock(currentBlockElement); + let className = 'pt-0'; + const paddingClass = new RegExp(/\pt-.+?\b/, 'g'); + if (currentBlockElement.className.match(paddingClass)) { + currentBlockElement.classList.forEach( cn => { + if(cn.match(paddingClass)){ + className = cn; + } + }); + let parts = className.split('-'); + let padding = parseInt(parts[1]); + if(padding >= 1){ + currentBlockElement.classList.remove('pt-'+padding); + padding = padding - 1; + currentBlockElement.classList.add('pt-'+padding); + } + } + } + + increasePaddingBottom(event, button) { + const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); + + if(currentBlockIndex < 0){ + return; + } + + const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); + if (!currentBlock){ + return; + } + + const currentBlockElement = currentBlock.holder; + + // let block = this.api.blocks.getBlock(currentBlockElement); + let className = 'pb-0'; + const paddingClass = new RegExp(/\pb-.+?\b/, 'g'); + if (currentBlockElement.className.match(paddingClass)) { + currentBlockElement.classList.forEach( cn => { + if(cn.match(paddingClass)){ + className = cn; + } + }); + let parts = className.split('-'); + let padding = parseInt(parts[1]); + if(padding <= 4){ + currentBlockElement.classList.remove('pb-'+padding); + padding = padding + 1; + currentBlockElement.classList.add('pb-'+padding); + } + } + } + + decreasePaddingBottom(event, button) { + const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); + + if(currentBlockIndex < 0){ + return; + } + + const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); + if (!currentBlock){ + return; + } + + const currentBlockElement = currentBlock.holder; + + // let block = this.api.blocks.getBlock(currentBlockElement); + let className = 'pb-0'; + const paddingClass = new RegExp(/\pb-.+?\b/, 'g'); + if (currentBlockElement.className.match(paddingClass)) { + currentBlockElement.classList.forEach( cn => { + if(cn.match(paddingClass)){ + className = cn; + } + }); + let parts = className.split('-'); + let padding = parseInt(parts[1]); + if(padding >= 1){ + currentBlockElement.classList.remove('pb-'+padding); + padding = padding - 1; + currentBlockElement.classList.add('pb-'+padding); + } + } + } +} \ No newline at end of file diff --git a/frappe/public/scss/desk/index.scss b/frappe/public/scss/desk/index.scss index d0d968df63..af62bb03eb 100644 --- a/frappe/public/scss/desk/index.scss +++ b/frappe/public/scss/desk/index.scss @@ -24,6 +24,7 @@ @import "notification"; @import "global_search"; @import "desktop"; +@import "wiki"; @import "../common/awesomeplete"; @import "sidebar"; @import "filters"; diff --git a/frappe/public/scss/desk/wiki.scss b/frappe/public/scss/desk/wiki.scss new file mode 100644 index 0000000000..a04fb1e501 --- /dev/null +++ b/frappe/public/scss/desk/wiki.scss @@ -0,0 +1,154 @@ +[data-page-route="wiki"] { + @media (min-width: map-get($grid-breakpoints, "lg")) { + .layout-main { + height: calc(100vh - var(--navbar-height) - var(--page-head-height) - 5px); + .layout-side-section, .layout-main-section-wrapper { + height: 100%; + overflow-y: auto; + } + .desk-sidebar { + margin-bottom: var(--margin-2xl); + } + } + } +} + +.ce-header { + padding: 0 !important; + margin-bottom: 0 !important; +} + +.codex-editor { + min-height: 630px; + + svg { + fill: none; + } + + .ce-toolbar { + svg { + fill: currentColor; + } + + .icon { + stroke: none; + width: fit-content; + } + } + + .ce-inline-tool, .ce-inline-toolbar__dropdown { + .icon { + fill: currentColor; + } + } + @media (min-width: 1199px) { + .ce-toolbar__content { + max-width: 930px; + } + } + @media (max-width: 995px) { + .ce-toolbar__content { + max-width: 760px; + } + } + + @media (max-width: 1199px) { + .ce-block.col-4 { + flex: 0 0 50%; + max-width: 50%; + } + } + + @media (max-width: 750px) { + .ce-block.col-4 { + flex: 0 0 100%; + max-width: 100%; + } + } + @media (max-width: 750px) { + .ce-block.col-6 { + flex: 0 0 100%; + max-width: 100%; + } + } + + div[card_name] { + height: inherit; + } + +} + +.codex-editor__redactor{ + display: flex; + flex-wrap: wrap; + flex-direction: row; + margin: 0px -7px; +} +.ce-block{ + width: 100%; + padding-left: 0; + padding-right: 0; +} +.cdx-settings-input{ + border: 1px solid rgba(201,201,204,.48); + -webkit-box-shadow: inset 0 1px 2px 0 rgba(35,44,72,.06); + box-shadow: inset 0 1px 2px 0 rgba(35,44,72,.06); + border-radius: 3px;padding: 3px 8px;outline: none; + width: 100%; + -webkit-box-sizing: border-box; + box-sizing: border-box; +} +.cdx-small{ + font-size: .6rem +} +.ce-block__content { + max-width: 100%; + height: 100%; + padding: 7px; + + &> div { + height: 100%; + } +} + +.cdx-settings-button.disabled{ + pointer-events: none; + opacity: .5 +} +.cdx-settings-sidebar{ + position: absolute; + right: 100%; + top:0; + background: #fff; + width: 108px; + height: 145px; + box-shadow: 0 3px 15px -3px rgba(13,20,33,.13); + border-radius: 0 4px 4px 0;z-index: 0; +} + + +[data-page-route="wiki"] { + + .standard-sidebar-item { + justify-content: space-between; + } + + .sidebar-child-item-container { + margin-left: 10px; + + .standard-sidebar-item { + justify-content: start; + } + } + + .sidebar-item-label { + flex: 1; + } + + .item-anchor { + display: flex; + overflow: hidden; + flex: 1; + } + +} \ No newline at end of file diff --git a/package.json b/package.json index 928456578c..17f5a7b588 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,8 @@ }, "homepage": "https://frappeframework.com", "dependencies": { + "@editorjs/editorjs": "^2.20.0", + "@editorjs/header": "^2.6.1", "ace-builds": "^1.4.8", "air-datepicker": "github:frappe/air-datepicker", "autoprefixer": "^9.8.6", @@ -54,8 +56,11 @@ "vue-router": "^2.0.0" }, "devDependencies": { + "@editorjs/checklist": "^1.3.0", + "@editorjs/list": "^1.6.2", "babel-runtime": "^6.26.0", "chalk": "^2.3.2", + "editorjs-undo": "^0.1.5", "graphlib": "^2.1.8", "less": "^3.11.1", "rollup": "^1.2.2", diff --git a/yarn.lock b/yarn.lock index fbd567debf..8d0b04c622 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3,123 +3,155 @@ "@babel/code-frame@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8" - integrity sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA== + "integrity" "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==" + "resolved" "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz" + "version" "7.0.0" dependencies: "@babel/highlight" "^7.0.0" "@babel/highlight@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4" - integrity sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw== + "integrity" "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==" + "resolved" "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz" + "version" "7.0.0" dependencies: - chalk "^2.0.0" - esutils "^2.0.2" - js-tokens "^4.0.0" + "chalk" "^2.0.0" + "esutils" "^2.0.2" + "js-tokens" "^4.0.0" "@babel/runtime@^7.0.0-beta.46": - version "7.3.4" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.3.4.tgz#73d12ba819e365fcf7fd152aed56d6df97d21c83" - integrity sha512-IvfvnMdSaLBateu0jfsYIpZTxAc2cKEXEMiezGGN75QcBcecDUKd3PgLAncT0oOgxKy8dd8hrJKj9MfzgfZd6g== + "integrity" "sha512-IvfvnMdSaLBateu0jfsYIpZTxAc2cKEXEMiezGGN75QcBcecDUKd3PgLAncT0oOgxKy8dd8hrJKj9MfzgfZd6g==" + "resolved" "https://registry.npmjs.org/@babel/runtime/-/runtime-7.3.4.tgz" + "version" "7.3.4" dependencies: - regenerator-runtime "^0.12.0" + "regenerator-runtime" "^0.12.0" "@dabh/diagnostics@^2.0.2": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.2.tgz#290d08f7b381b8f94607dc8f471a12c675f9db31" - integrity sha512-+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q== + "integrity" "sha512-+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q==" + "resolved" "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.2.tgz" + "version" "2.0.2" dependencies: - colorspace "1.1.x" - enabled "2.0.x" - kuler "^2.0.0" + "colorspace" "1.1.x" + "enabled" "2.0.x" + "kuler" "^2.0.0" "@deepcode/dcignore@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@deepcode/dcignore/-/dcignore-1.0.2.tgz#39e4a3df7dde8811925330506e4bb3fbf3c288d8" - integrity sha512-DPgxtHuJwBORpqRkPXzzOT+uoPRVJmaN7LR+pmeL6DQM90kj6G6GFUH1i/YpRH8NbML8ZGEDwB9f9u4UwD2pzg== + "integrity" "sha512-DPgxtHuJwBORpqRkPXzzOT+uoPRVJmaN7LR+pmeL6DQM90kj6G6GFUH1i/YpRH8NbML8ZGEDwB9f9u4UwD2pzg==" + "resolved" "https://registry.npmjs.org/@deepcode/dcignore/-/dcignore-1.0.2.tgz" + "version" "1.0.2" + +"@editorjs/checklist@^1.3.0": + "integrity" "sha512-087oW0oOIE5HX8llj4Eap/reFDFw8VCLlp6GU0E9GEp7f3zy2aV6KdFR+6dbYhZ50w7tSnkMpCAcSq1NXJeB4Q==" + "resolved" "https://registry.npmjs.org/@editorjs/checklist/-/checklist-1.3.0.tgz" + "version" "1.3.0" + +"@editorjs/editorjs@^2.20.0": + "integrity" "sha512-e6DWi8bMypFhovq9R6cefaDWVfrlVU++Q7ABp79+MxZIuC/SKAW5EtxBbKPL22H/Mc3bJIhZCxOqEl70HBh2yw==" + "resolved" "https://registry.npmjs.org/@editorjs/editorjs/-/editorjs-2.20.0.tgz" + "version" "2.20.0" + dependencies: + "codex-notifier" "^1.1.2" + "codex-tooltip" "^1.0.1" + +"@editorjs/header@^2.6.1": + "integrity" "sha512-EsnyVFv5uThpU9tbQ/dUPFCQoa/sBFy2n+9tN3wOXJGx7sjea4fdcacJ2UYhO+7pCgZ+aSgmMOyGLYHUFbchvA==" + "resolved" "https://registry.npmjs.org/@editorjs/header/-/header-2.6.1.tgz" + "version" "2.6.1" + +"@editorjs/list@^1.6.2": + "integrity" "sha512-OxowV0yuE11G01czYM1dEQlz1F37ehX0ak5vAbZ9ncSXrPh0fDRw/fBxTY654FlmrsQ40UFom3owSG++tLvVGw==" + "resolved" "https://registry.npmjs.org/@editorjs/list/-/list-1.6.2.tgz" + "version" "1.6.2" "@nodelib/fs.scandir@2.1.4": - version "2.1.4" - resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69" - integrity sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA== + "integrity" "sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==" + "resolved" "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz" + "version" "2.1.4" dependencies: "@nodelib/fs.stat" "2.0.4" - run-parallel "^1.1.9" + "run-parallel" "^1.1.9" -"@nodelib/fs.stat@2.0.4", "@nodelib/fs.stat@^2.0.2": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz#a3f2dd61bab43b8db8fa108a121cfffe4c676655" - integrity sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q== +"@nodelib/fs.stat@^2.0.2", "@nodelib/fs.stat@2.0.4": + "integrity" "sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==" + "resolved" "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz" + "version" "2.0.4" "@nodelib/fs.walk@^1.2.3": - version "1.2.6" - resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz#cce9396b30aa5afe9e3756608f5831adcb53d063" - integrity sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow== + "integrity" "sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==" + "resolved" "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz" + "version" "1.2.6" dependencies: "@nodelib/fs.scandir" "2.1.4" - fastq "^1.6.0" + "fastq" "^1.6.0" "@octetstream/promisify@2.0.2": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@octetstream/promisify/-/promisify-2.0.2.tgz#29ac3bd7aefba646db670227f895d812c1a19615" - integrity sha512-7XHoRB61hxsz8lBQrjC1tq/3OEIgpvGWg6DKAdwi7WRzruwkmsdwmOoUXbU4Dtd4RSOMDwed0SkP3y8UlMt1Bg== + "integrity" "sha512-7XHoRB61hxsz8lBQrjC1tq/3OEIgpvGWg6DKAdwi7WRzruwkmsdwmOoUXbU4Dtd4RSOMDwed0SkP3y8UlMt1Bg==" + "resolved" "https://registry.npmjs.org/@octetstream/promisify/-/promisify-2.0.2.tgz" + "version" "2.0.2" "@open-policy-agent/opa-wasm@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@open-policy-agent/opa-wasm/-/opa-wasm-1.2.0.tgz#481b766093f70b00efefbee1e4192f375fd34ca2" - integrity sha512-CtUBTnzvDrT0NASa8IuGQTxFGgt2vxbLnMYuTA+uDFxOcA4uK4mGFgrhHJtxUZnWHiwemOvKKSY3BMCo7qiAsQ== + "integrity" "sha512-CtUBTnzvDrT0NASa8IuGQTxFGgt2vxbLnMYuTA+uDFxOcA4uK4mGFgrhHJtxUZnWHiwemOvKKSY3BMCo7qiAsQ==" + "resolved" "https://registry.npmjs.org/@open-policy-agent/opa-wasm/-/opa-wasm-1.2.0.tgz" + "version" "1.2.0" dependencies: - sprintf-js "^1.1.2" - utf8 "^3.0.0" + "sprintf-js" "^1.1.2" + "utf8" "^3.0.0" "@sindresorhus/is@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" - integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== + "integrity" "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==" + "resolved" "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz" + "version" "0.14.0" "@sindresorhus/is@^2.1.1": - version "2.1.1" - resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-2.1.1.tgz#ceff6a28a5b4867c2dd4a1ba513de278ccbe8bb1" - integrity sha512-/aPsuoj/1Dw/kzhkgz+ES6TxG0zfTMGLwuK2ZG00k/iJzYHTLCE8mVU8EPqEOp/lmxPoq1C1C9RYToRKb2KEfg== + "integrity" "sha512-/aPsuoj/1Dw/kzhkgz+ES6TxG0zfTMGLwuK2ZG00k/iJzYHTLCE8mVU8EPqEOp/lmxPoq1C1C9RYToRKb2KEfg==" + "resolved" "https://registry.npmjs.org/@sindresorhus/is/-/is-2.1.1.tgz" + "version" "2.1.1" + +"@snyk/cli-interface@^2.0.3": + "integrity" "sha512-jmZyxVHqzYU1GfdnWCGdd68WY/lAzpPVyqalHazPj4tFJehrSfEFc82RMTYAMgXEJuvFRFIwhsvXh3sWUhIQmg==" + "resolved" "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.3.2.tgz" + "version" "2.3.2" + dependencies: + "tslib" "^1.9.3" -"@snyk/cli-interface@2.11.0", "@snyk/cli-interface@^2.11.0": - version "2.11.0" - resolved "https://registry.yarnpkg.com/@snyk/cli-interface/-/cli-interface-2.11.0.tgz#9df68c8cd54de5dff69f0ab797a188541d9c8965" - integrity sha512-T3xfDqrEFKclHGdJx4/5+D5F7e76/99f33guE4RTlVITBhy7VVnjz4t/NDr3UYqcC0MgAmiC4bSVYHnlshuwJw== +"@snyk/cli-interface@^2.11.0", "@snyk/cli-interface@2.11.0": + "integrity" "sha512-T3xfDqrEFKclHGdJx4/5+D5F7e76/99f33guE4RTlVITBhy7VVnjz4t/NDr3UYqcC0MgAmiC4bSVYHnlshuwJw==" + "resolved" "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.11.0.tgz" + "version" "2.11.0" dependencies: "@types/graphlib" "^2" -"@snyk/cli-interface@^2.0.3": - version "2.3.2" - resolved "https://registry.yarnpkg.com/@snyk/cli-interface/-/cli-interface-2.3.2.tgz#e93afa82de15b912e657f1ba86f9d7963983e594" - integrity sha512-jmZyxVHqzYU1GfdnWCGdd68WY/lAzpPVyqalHazPj4tFJehrSfEFc82RMTYAMgXEJuvFRFIwhsvXh3sWUhIQmg== +"@snyk/cli-interface@^2.9.1": + "integrity" "sha512-C64bGtcQbh7941l7qgXFJ+FJIZdQtBHkPhKfGtUlCCMbC0FK0oaUmp6d7YPQxT4dEnkQdtlBT/eA2F6qIKbEng==" + "resolved" "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.9.2.tgz" + "version" "2.9.2" dependencies: - tslib "^1.9.3" + "@snyk/dep-graph" "1.19.4" + "@types/graphlib" "^2.1.7" + "tslib" "^1.9.3" -"@snyk/cli-interface@^2.9.1", "@snyk/cli-interface@^2.9.2": - version "2.9.2" - resolved "https://registry.yarnpkg.com/@snyk/cli-interface/-/cli-interface-2.9.2.tgz#defbeafd5fa7fa5ab1c39d57f1d379b2fbfc9860" - integrity sha512-C64bGtcQbh7941l7qgXFJ+FJIZdQtBHkPhKfGtUlCCMbC0FK0oaUmp6d7YPQxT4dEnkQdtlBT/eA2F6qIKbEng== +"@snyk/cli-interface@^2.9.2": + "integrity" "sha512-C64bGtcQbh7941l7qgXFJ+FJIZdQtBHkPhKfGtUlCCMbC0FK0oaUmp6d7YPQxT4dEnkQdtlBT/eA2F6qIKbEng==" + "resolved" "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.9.2.tgz" + "version" "2.9.2" dependencies: "@snyk/dep-graph" "1.19.4" "@types/graphlib" "^2.1.7" - tslib "^1.9.3" + "tslib" "^1.9.3" "@snyk/cocoapods-lockfile-parser@3.6.2": - version "3.6.2" - resolved "https://registry.yarnpkg.com/@snyk/cocoapods-lockfile-parser/-/cocoapods-lockfile-parser-3.6.2.tgz#803ae9466f408c48ba7c5a8ec51b9dbac6f633b3" - integrity sha512-ca2JKOnSRzYHJkhOB9gYmdRZHmd02b/uBd/S0D5W+L9nIMS7sUBV5jfhKwVgrYPIpVNIc0XCI9rxK4TfkQRpiA== + "integrity" "sha512-ca2JKOnSRzYHJkhOB9gYmdRZHmd02b/uBd/S0D5W+L9nIMS7sUBV5jfhKwVgrYPIpVNIc0XCI9rxK4TfkQRpiA==" + "resolved" "https://registry.npmjs.org/@snyk/cocoapods-lockfile-parser/-/cocoapods-lockfile-parser-3.6.2.tgz" + "version" "3.6.2" dependencies: "@snyk/dep-graph" "^1.23.1" "@types/js-yaml" "^3.12.1" - js-yaml "^3.13.1" - tslib "^1.10.0" + "js-yaml" "^3.13.1" + "tslib" "^1.10.0" "@snyk/code-client@3.4.0": - version "3.4.0" - resolved "https://registry.yarnpkg.com/@snyk/code-client/-/code-client-3.4.0.tgz#7741abef6dcf5dfc50a1a0538918972360c5a1e7" - integrity sha512-RY2IftAiWB7tp36Mcq7WiEwqoD8A/mqrD6N7oDWTxBOIqsH0t4djo/UibiWDJotaffO9aXXndOf3iZ/kTt+Rdg== + "integrity" "sha512-RY2IftAiWB7tp36Mcq7WiEwqoD8A/mqrD6N7oDWTxBOIqsH0t4djo/UibiWDJotaffO9aXXndOf3iZ/kTt+Rdg==" + "resolved" "https://registry.npmjs.org/@snyk/code-client/-/code-client-3.4.0.tgz" + "version" "3.4.0" dependencies: "@deepcode/dcignore" "^1.0.2" "@snyk/fast-glob" "^3.2.6-patch" @@ -130,273 +162,285 @@ "@types/micromatch" "^4.0.1" "@types/sarif" "^2.1.3" "@types/uuid" "^8.3.0" - axios "^0.21.1" - ignore "^5.1.8" - lodash.chunk "^4.2.0" - lodash.omit "^4.5.0" - lodash.union "^4.6.0" - micromatch "^4.0.2" - queue "^6.0.1" - uuid "^8.3.2" + "axios" "^0.21.1" + "ignore" "^5.1.8" + "lodash.chunk" "^4.2.0" + "lodash.omit" "^4.5.0" + "lodash.union" "^4.6.0" + "micromatch" "^4.0.2" + "queue" "^6.0.1" + "uuid" "^8.3.2" "@snyk/composer-lockfile-parser@^1.4.1": - version "1.4.1" - resolved "https://registry.yarnpkg.com/@snyk/composer-lockfile-parser/-/composer-lockfile-parser-1.4.1.tgz#2f7c93ad367520322b16d9490a208fec08445e0e" - integrity sha512-wNANv235j95NFsQuODIXCiQZ9kcyg9fz92Kg1zoGvaP3kN/ma7fgCnvQL/dyml6iouQJR5aZovjhrrfEFoKtiQ== - dependencies: - lodash.findkey "^4.6.0" - lodash.get "^4.4.2" - lodash.invert "^4.3.0" - lodash.isempty "^4.4.0" - -"@snyk/dep-graph@1.19.4", "@snyk/dep-graph@^1.19.3": - version "1.19.4" - resolved "https://registry.yarnpkg.com/@snyk/dep-graph/-/dep-graph-1.19.4.tgz#d156c482bfdfba7505f1cf3e8a80b86dd9f45383" - integrity sha512-h3MMhjVm3BuIruwpDBqnMowKOG9viwr3TJHdIxTHulWKWSsPTTW1AAP3/RaK+UBp1y/Ua9yzeHncKIrzBdT5Nw== - dependencies: - graphlib "^2.1.8" - lodash.isequal "^4.5.0" - object-hash "^2.0.3" - semver "^6.0.0" - source-map-support "^0.5.19" - tslib "^1.13.0" - -"@snyk/dep-graph@^1.21.0", "@snyk/dep-graph@^1.23.0", "@snyk/dep-graph@^1.23.1", "@snyk/dep-graph@^1.27.1", "@snyk/dep-graph@^1.28.0": - version "1.28.0" - resolved "https://registry.yarnpkg.com/@snyk/dep-graph/-/dep-graph-1.28.0.tgz#d68c0576cb3562c6e819ca8a8c7ac29ee11d9776" - integrity sha512-Oup9nAvb558jdNvbZah/vaBtOtCcizkdeS+OBQeBIqIffyer4mc4juSn4b1SFjCpu7AG7piio8Lj8k1B9ps6Tg== - dependencies: - event-loop-spinner "^2.1.0" - lodash.clone "^4.5.0" - lodash.constant "^3.0.0" - lodash.filter "^4.6.0" - lodash.foreach "^4.5.0" - lodash.isempty "^4.4.0" - lodash.isequal "^4.5.0" - lodash.isfunction "^3.0.9" - lodash.isundefined "^3.0.1" - lodash.keys "^4.2.0" - lodash.map "^4.6.0" - lodash.reduce "^4.6.0" - lodash.size "^4.2.0" - lodash.transform "^4.6.0" - lodash.union "^4.6.0" - lodash.values "^4.3.0" - object-hash "^2.0.3" - semver "^7.0.0" - tslib "^1.13.0" + "integrity" "sha512-wNANv235j95NFsQuODIXCiQZ9kcyg9fz92Kg1zoGvaP3kN/ma7fgCnvQL/dyml6iouQJR5aZovjhrrfEFoKtiQ==" + "resolved" "https://registry.npmjs.org/@snyk/composer-lockfile-parser/-/composer-lockfile-parser-1.4.1.tgz" + "version" "1.4.1" + dependencies: + "lodash.findkey" "^4.6.0" + "lodash.get" "^4.4.2" + "lodash.invert" "^4.3.0" + "lodash.isempty" "^4.4.0" + +"@snyk/dep-graph@^1.19.3": + "integrity" "sha512-h3MMhjVm3BuIruwpDBqnMowKOG9viwr3TJHdIxTHulWKWSsPTTW1AAP3/RaK+UBp1y/Ua9yzeHncKIrzBdT5Nw==" + "resolved" "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.19.4.tgz" + "version" "1.19.4" + dependencies: + "graphlib" "^2.1.8" + "lodash.isequal" "^4.5.0" + "object-hash" "^2.0.3" + "semver" "^6.0.0" + "source-map-support" "^0.5.19" + "tslib" "^1.13.0" + +"@snyk/dep-graph@^1", "@snyk/dep-graph@^1.21.0", "@snyk/dep-graph@^1.23.0", "@snyk/dep-graph@^1.23.1", "@snyk/dep-graph@^1.27.1", "@snyk/dep-graph@^1.28.0": + "integrity" "sha512-Oup9nAvb558jdNvbZah/vaBtOtCcizkdeS+OBQeBIqIffyer4mc4juSn4b1SFjCpu7AG7piio8Lj8k1B9ps6Tg==" + "resolved" "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.28.0.tgz" + "version" "1.28.0" + dependencies: + "event-loop-spinner" "^2.1.0" + "lodash.clone" "^4.5.0" + "lodash.constant" "^3.0.0" + "lodash.filter" "^4.6.0" + "lodash.foreach" "^4.5.0" + "lodash.isempty" "^4.4.0" + "lodash.isequal" "^4.5.0" + "lodash.isfunction" "^3.0.9" + "lodash.isundefined" "^3.0.1" + "lodash.keys" "^4.2.0" + "lodash.map" "^4.6.0" + "lodash.reduce" "^4.6.0" + "lodash.size" "^4.2.0" + "lodash.transform" "^4.6.0" + "lodash.union" "^4.6.0" + "lodash.values" "^4.3.0" + "object-hash" "^2.0.3" + "semver" "^7.0.0" + "tslib" "^1.13.0" + +"@snyk/dep-graph@1.19.4": + "integrity" "sha512-h3MMhjVm3BuIruwpDBqnMowKOG9viwr3TJHdIxTHulWKWSsPTTW1AAP3/RaK+UBp1y/Ua9yzeHncKIrzBdT5Nw==" + "resolved" "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.19.4.tgz" + "version" "1.19.4" + dependencies: + "graphlib" "^2.1.8" + "lodash.isequal" "^4.5.0" + "object-hash" "^2.0.3" + "semver" "^6.0.0" + "source-map-support" "^0.5.19" + "tslib" "^1.13.0" "@snyk/docker-registry-v2-client@1.13.9": - version "1.13.9" - resolved "https://registry.yarnpkg.com/@snyk/docker-registry-v2-client/-/docker-registry-v2-client-1.13.9.tgz#54c2e3071de58fc6fc12c5fef5eaeae174ecda12" - integrity sha512-DIFLEhr8m1GrAwsLGInJmpcQMacjuhf3jcbpQTR+LeMvZA9IuKq+B7kqw2O2FzMiHMZmUb5z+tV+BR7+IUHkFQ== + "integrity" "sha512-DIFLEhr8m1GrAwsLGInJmpcQMacjuhf3jcbpQTR+LeMvZA9IuKq+B7kqw2O2FzMiHMZmUb5z+tV+BR7+IUHkFQ==" + "resolved" "https://registry.npmjs.org/@snyk/docker-registry-v2-client/-/docker-registry-v2-client-1.13.9.tgz" + "version" "1.13.9" dependencies: - needle "^2.5.0" - parse-link-header "^1.0.1" - tslib "^1.10.0" + "needle" "^2.5.0" + "parse-link-header" "^1.0.1" + "tslib" "^1.10.0" "@snyk/fast-glob@^3.2.6-patch": - version "3.2.6-patch" - resolved "https://registry.yarnpkg.com/@snyk/fast-glob/-/fast-glob-3.2.6-patch.tgz#a0866bedb17f95255e4050dad08daeaff0f4caa8" - integrity sha512-E/Pfdze/WFfxwyuTFcfhQN1SwyUsc43yuCoW63RVBCaxTD6OzhVD2Pvc/Sy7BjiWUfmelzyKkIBpoow8zZX7Zg== + "integrity" "sha512-E/Pfdze/WFfxwyuTFcfhQN1SwyUsc43yuCoW63RVBCaxTD6OzhVD2Pvc/Sy7BjiWUfmelzyKkIBpoow8zZX7Zg==" + "resolved" "https://registry.npmjs.org/@snyk/fast-glob/-/fast-glob-3.2.6-patch.tgz" + "version" "3.2.6-patch" dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" "@snyk/glob-parent" "^5.1.2-patch.1" - merge2 "^1.3.0" - micromatch "^4.0.2" - picomatch "^2.2.1" + "merge2" "^1.3.0" + "micromatch" "^4.0.2" + "picomatch" "^2.2.1" "@snyk/fix@1.518.0": - version "1.518.0" - resolved "https://registry.yarnpkg.com/@snyk/fix/-/fix-1.518.0.tgz#8af97a17da737739b1f31fe2d2129c99fcb574ed" - integrity sha512-Cwh0wU8SxZgx1+qRgcGkMctNx9F6UCdUJYcCvKaYJNDEYQwpQat4nsLZsJeODYNx7Byh0ZnPrqakUck4qFrPvA== + "integrity" "sha512-Cwh0wU8SxZgx1+qRgcGkMctNx9F6UCdUJYcCvKaYJNDEYQwpQat4nsLZsJeODYNx7Byh0ZnPrqakUck4qFrPvA==" + "resolved" "https://registry.npmjs.org/@snyk/fix/-/fix-1.518.0.tgz" + "version" "1.518.0" dependencies: "@snyk/dep-graph" "^1.21.0" - chalk "4.1.0" - debug "^4.3.1" - micromatch "4.0.2" - ora "5.3.0" - p-map "^4.0.0" - strip-ansi "6.0.0" + "chalk" "4.1.0" + "debug" "^4.3.1" + "micromatch" "4.0.2" + "ora" "5.3.0" + "p-map" "^4.0.0" + "strip-ansi" "6.0.0" "@snyk/gemfile@1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@snyk/gemfile/-/gemfile-1.2.0.tgz#919857944973cce74c650e5428aaf11bcd5c0457" - integrity sha512-nI7ELxukf7pT4/VraL4iabtNNMz8mUo7EXlqCFld8O5z6mIMLX9llps24iPpaIZOwArkY3FWA+4t+ixyvtTSIA== + "integrity" "sha512-nI7ELxukf7pT4/VraL4iabtNNMz8mUo7EXlqCFld8O5z6mIMLX9llps24iPpaIZOwArkY3FWA+4t+ixyvtTSIA==" + "resolved" "https://registry.npmjs.org/@snyk/gemfile/-/gemfile-1.2.0.tgz" + "version" "1.2.0" "@snyk/glob-parent@^5.1.2-patch.1": - version "5.1.2-patch.1" - resolved "https://registry.yarnpkg.com/@snyk/glob-parent/-/glob-parent-5.1.2-patch.1.tgz#87733b4ab282043fa7915200bc94cb391df6d44f" - integrity sha512-OkUPdHgxIWKAAzceG1nraNA0kgI+eS0I9wph8tll9UL0slD2mIWSj4mAqroGovaEXm8nHedoUfuDRGEb6wnzCQ== - dependencies: - is-glob "^4.0.1" - -"@snyk/graphlib@2.1.9-patch.3", "@snyk/graphlib@^2.1.9-patch.3": - version "2.1.9-patch.3" - resolved "https://registry.yarnpkg.com/@snyk/graphlib/-/graphlib-2.1.9-patch.3.tgz#b8edb2335af1978db7f3cb1f28f5d562960acf23" - integrity sha512-bBY9b9ulfLj0v2Eer0yFYa3syVeIxVKl2EpxSrsVeT4mjA0CltZyHsF0JjoaGXP27nItTdJS5uVsj1NA+3aE+Q== - dependencies: - lodash.clone "^4.5.0" - lodash.constant "^3.0.0" - lodash.filter "^4.6.0" - lodash.foreach "^4.5.0" - lodash.has "^4.5.2" - lodash.isempty "^4.4.0" - lodash.isfunction "^3.0.9" - lodash.isundefined "^3.0.1" - lodash.keys "^4.2.0" - lodash.map "^4.6.0" - lodash.reduce "^4.6.0" - lodash.size "^4.2.0" - lodash.transform "^4.6.0" - lodash.union "^4.6.0" - lodash.values "^4.3.0" + "integrity" "sha512-OkUPdHgxIWKAAzceG1nraNA0kgI+eS0I9wph8tll9UL0slD2mIWSj4mAqroGovaEXm8nHedoUfuDRGEb6wnzCQ==" + "resolved" "https://registry.npmjs.org/@snyk/glob-parent/-/glob-parent-5.1.2-patch.1.tgz" + "version" "5.1.2-patch.1" + dependencies: + "is-glob" "^4.0.1" + +"@snyk/graphlib@^2.1.9-patch.3", "@snyk/graphlib@2.1.9-patch.3": + "integrity" "sha512-bBY9b9ulfLj0v2Eer0yFYa3syVeIxVKl2EpxSrsVeT4mjA0CltZyHsF0JjoaGXP27nItTdJS5uVsj1NA+3aE+Q==" + "resolved" "https://registry.npmjs.org/@snyk/graphlib/-/graphlib-2.1.9-patch.3.tgz" + "version" "2.1.9-patch.3" + dependencies: + "lodash.clone" "^4.5.0" + "lodash.constant" "^3.0.0" + "lodash.filter" "^4.6.0" + "lodash.foreach" "^4.5.0" + "lodash.has" "^4.5.2" + "lodash.isempty" "^4.4.0" + "lodash.isfunction" "^3.0.9" + "lodash.isundefined" "^3.0.1" + "lodash.keys" "^4.2.0" + "lodash.map" "^4.6.0" + "lodash.reduce" "^4.6.0" + "lodash.size" "^4.2.0" + "lodash.transform" "^4.6.0" + "lodash.union" "^4.6.0" + "lodash.values" "^4.3.0" "@snyk/inquirer@^7.3.3-patch": - version "7.3.3-patch" - resolved "https://registry.yarnpkg.com/@snyk/inquirer/-/inquirer-7.3.3-patch.tgz#ef84d531724c53b755e8dd454e1a3c2ccdcfc0bf" - integrity sha512-aWiQSOacH2lOpJ1ard9ErABcH4tdJogdr+mg1U67iZJOPO9n2gFgAwz1TQJDyPkv4/A5mh4hT2rg03Uq+KBn2Q== - dependencies: - ansi-escapes "^4.2.1" - chalk "^4.1.0" - cli-cursor "^3.1.0" - cli-width "^3.0.0" - external-editor "^3.0.3" - figures "^3.0.0" - lodash.assign "^4.2.0" - lodash.assignin "^4.2.0" - lodash.clone "^4.5.0" - lodash.defaults "^4.2.0" - lodash.filter "^4.6.0" - lodash.find "^4.6.0" - lodash.findindex "^4.6.0" - lodash.flatten "^4.4.0" - lodash.isboolean "^3.0.3" - lodash.isfunction "^3.0.9" - lodash.isnumber "^3.0.3" - lodash.isplainobject "^4.0.6" - lodash.isstring "^4.0.1" - lodash.last "^3.0.0" - lodash.map "^4.6.0" - lodash.omit "^4.5.0" - lodash.set "^4.3.2" - lodash.sum "^4.0.2" - lodash.uniq "^4.5.0" - mute-stream "0.0.8" - run-async "^2.4.0" - rxjs "^6.6.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - through "^2.3.6" + "integrity" "sha512-aWiQSOacH2lOpJ1ard9ErABcH4tdJogdr+mg1U67iZJOPO9n2gFgAwz1TQJDyPkv4/A5mh4hT2rg03Uq+KBn2Q==" + "resolved" "https://registry.npmjs.org/@snyk/inquirer/-/inquirer-7.3.3-patch.tgz" + "version" "7.3.3-patch" + dependencies: + "ansi-escapes" "^4.2.1" + "chalk" "^4.1.0" + "cli-cursor" "^3.1.0" + "cli-width" "^3.0.0" + "external-editor" "^3.0.3" + "figures" "^3.0.0" + "lodash.assign" "^4.2.0" + "lodash.assignin" "^4.2.0" + "lodash.clone" "^4.5.0" + "lodash.defaults" "^4.2.0" + "lodash.filter" "^4.6.0" + "lodash.find" "^4.6.0" + "lodash.findindex" "^4.6.0" + "lodash.flatten" "^4.4.0" + "lodash.isboolean" "^3.0.3" + "lodash.isfunction" "^3.0.9" + "lodash.isnumber" "^3.0.3" + "lodash.isplainobject" "^4.0.6" + "lodash.isstring" "^4.0.1" + "lodash.last" "^3.0.0" + "lodash.map" "^4.6.0" + "lodash.omit" "^4.5.0" + "lodash.set" "^4.3.2" + "lodash.sum" "^4.0.2" + "lodash.uniq" "^4.5.0" + "mute-stream" "0.0.8" + "run-async" "^2.4.0" + "rxjs" "^6.6.0" + "string-width" "^4.1.0" + "strip-ansi" "^6.0.0" + "through" "^2.3.6" "@snyk/java-call-graph-builder@1.19.1": - version "1.19.1" - resolved "https://registry.yarnpkg.com/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.19.1.tgz#1d579d782df3bb5f9d5171cc35180596cd90aa8b" - integrity sha512-bxjHef5Qm3pNc+BrFlxMudmSSbOjA395ZqBddc+dvsFHoHeyNbiY56Y1JSGUlTgjRM+PKNPBiCuELTSMaROeZg== + "integrity" "sha512-bxjHef5Qm3pNc+BrFlxMudmSSbOjA395ZqBddc+dvsFHoHeyNbiY56Y1JSGUlTgjRM+PKNPBiCuELTSMaROeZg==" + "resolved" "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.19.1.tgz" + "version" "1.19.1" dependencies: "@snyk/graphlib" "2.1.9-patch.3" - ci-info "^2.0.0" - debug "^4.1.1" - glob "^7.1.6" - jszip "^3.2.2" - needle "^2.3.3" - progress "^2.0.3" - snyk-config "^4.0.0-rc.2" - source-map-support "^0.5.7" - temp-dir "^2.0.0" - tmp "^0.2.1" - tslib "^1.9.3" - xml-js "^1.6.11" + "ci-info" "^2.0.0" + "debug" "^4.1.1" + "glob" "^7.1.6" + "jszip" "^3.2.2" + "needle" "^2.3.3" + "progress" "^2.0.3" + "snyk-config" "^4.0.0-rc.2" + "source-map-support" "^0.5.7" + "temp-dir" "^2.0.0" + "tmp" "^0.2.1" + "tslib" "^1.9.3" + "xml-js" "^1.6.11" "@snyk/java-call-graph-builder@1.20.0": - version "1.20.0" - resolved "https://registry.yarnpkg.com/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.20.0.tgz#ffca734cf7ce276a69277963149358190eaac3e5" - integrity sha512-NX8bpIu7oG5cuSSm6WvtxqcCuJs2gRjtKhtuSeF1p5TYXyESs3FXQ0nHjfY90LiyTTc+PW/UBq6SKbBA6bCBww== + "integrity" "sha512-NX8bpIu7oG5cuSSm6WvtxqcCuJs2gRjtKhtuSeF1p5TYXyESs3FXQ0nHjfY90LiyTTc+PW/UBq6SKbBA6bCBww==" + "resolved" "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.20.0.tgz" + "version" "1.20.0" dependencies: "@snyk/graphlib" "2.1.9-patch.3" - ci-info "^2.0.0" - debug "^4.1.1" - glob "^7.1.6" - jszip "^3.2.2" - needle "^2.3.3" - progress "^2.0.3" - snyk-config "^4.0.0-rc.2" - source-map-support "^0.5.7" - temp-dir "^2.0.0" - tmp "^0.2.1" - tslib "^1.9.3" - xml-js "^1.6.11" + "ci-info" "^2.0.0" + "debug" "^4.1.1" + "glob" "^7.1.6" + "jszip" "^3.2.2" + "needle" "^2.3.3" + "progress" "^2.0.3" + "snyk-config" "^4.0.0-rc.2" + "source-map-support" "^0.5.7" + "temp-dir" "^2.0.0" + "tmp" "^0.2.1" + "tslib" "^1.9.3" + "xml-js" "^1.6.11" "@snyk/mix-parser@^1.1.0": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@snyk/mix-parser/-/mix-parser-1.1.1.tgz#3493222b4e3d84a6fb56bce5238922a532a81191" - integrity sha512-KmX4Le+1M01m6kM2UeDColzMZctrSqoMGajqcRHR3dLpCyHE3nzZzPeOWjbUVgjQlTX07oQvq9udSJGZJ/+Gdg== + "integrity" "sha512-KmX4Le+1M01m6kM2UeDColzMZctrSqoMGajqcRHR3dLpCyHE3nzZzPeOWjbUVgjQlTX07oQvq9udSJGZJ/+Gdg==" + "resolved" "https://registry.npmjs.org/@snyk/mix-parser/-/mix-parser-1.1.1.tgz" + "version" "1.1.1" dependencies: "@snyk/dep-graph" "^1.28.0" - tslib "^2.0.0" + "tslib" "^2.0.0" "@snyk/rpm-parser@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@snyk/rpm-parser/-/rpm-parser-2.0.0.tgz#4ded7fa4b0a8efca7699359e4ca7a79bfbe38bc1" - integrity sha512-bWjQY5Xk3TcfVpeo8M5BhhSUEdPr2P19AWW13CHPu6sFZkckLWEcjQycnBsVD6RBmxGXecJ1YNui8dq6soHoYQ== + "integrity" "sha512-bWjQY5Xk3TcfVpeo8M5BhhSUEdPr2P19AWW13CHPu6sFZkckLWEcjQycnBsVD6RBmxGXecJ1YNui8dq6soHoYQ==" + "resolved" "https://registry.npmjs.org/@snyk/rpm-parser/-/rpm-parser-2.0.0.tgz" + "version" "2.0.0" dependencies: - event-loop-spinner "^2.0.0" + "event-loop-spinner" "^2.0.0" "@snyk/snyk-cocoapods-plugin@2.5.2": - version "2.5.2" - resolved "https://registry.yarnpkg.com/@snyk/snyk-cocoapods-plugin/-/snyk-cocoapods-plugin-2.5.2.tgz#cd724fcd637cb3af76187bf7254819b6079489f6" - integrity sha512-WHhnwyoGOhjFOjBXqUfszD84SErrtjHjium/4xFbqKpEE+yuwxs8OwV/S29BtxhYiGtjpD1azv5QtH30VUMl0A== + "integrity" "sha512-WHhnwyoGOhjFOjBXqUfszD84SErrtjHjium/4xFbqKpEE+yuwxs8OwV/S29BtxhYiGtjpD1azv5QtH30VUMl0A==" + "resolved" "https://registry.npmjs.org/@snyk/snyk-cocoapods-plugin/-/snyk-cocoapods-plugin-2.5.2.tgz" + "version" "2.5.2" dependencies: "@snyk/cli-interface" "^2.11.0" "@snyk/cocoapods-lockfile-parser" "3.6.2" "@snyk/dep-graph" "^1.23.1" - source-map-support "^0.5.7" - tslib "^2.0.0" + "source-map-support" "^0.5.7" + "tslib" "^2.0.0" "@snyk/snyk-docker-pull@3.2.3": - version "3.2.3" - resolved "https://registry.yarnpkg.com/@snyk/snyk-docker-pull/-/snyk-docker-pull-3.2.3.tgz#9743ea624098c7abd0f95c438c76067530494f4b" - integrity sha512-hiFiSmWGLc2tOI7FfgIhVdFzO2f69im8O6p3OV4xEZ/Ss1l58vwtqudItoswsk7wj/azRlgfBW8wGu2MjoudQg== + "integrity" "sha512-hiFiSmWGLc2tOI7FfgIhVdFzO2f69im8O6p3OV4xEZ/Ss1l58vwtqudItoswsk7wj/azRlgfBW8wGu2MjoudQg==" + "resolved" "https://registry.npmjs.org/@snyk/snyk-docker-pull/-/snyk-docker-pull-3.2.3.tgz" + "version" "3.2.3" dependencies: "@snyk/docker-registry-v2-client" "1.13.9" - child-process "^1.0.2" - tar-stream "^2.1.2" - tmp "^0.1.0" + "child-process" "^1.0.2" + "tar-stream" "^2.1.2" + "tmp" "^0.1.0" "@snyk/snyk-hex-plugin@1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@snyk/snyk-hex-plugin/-/snyk-hex-plugin-1.0.0.tgz#617c91b5c19a6ccbb3a9a1a87d9e87b84621bdb3" - integrity sha512-ZydVdZ5kDpPDoehQnNHN3wZ6c470k5DPLJtWMoyfzlnCU2+y1rsUEdn4yhttn60RPx3JiLGwmckeDvZw8BqnGQ== + "integrity" "sha512-ZydVdZ5kDpPDoehQnNHN3wZ6c470k5DPLJtWMoyfzlnCU2+y1rsUEdn4yhttn60RPx3JiLGwmckeDvZw8BqnGQ==" + "resolved" "https://registry.npmjs.org/@snyk/snyk-hex-plugin/-/snyk-hex-plugin-1.0.0.tgz" + "version" "1.0.0" dependencies: "@snyk/dep-graph" "^1.28.0" "@snyk/mix-parser" "^1.1.0" - debug "^4.3.1" - tslib "^2.0.0" + "debug" "^4.3.1" + "tslib" "^2.0.0" "@szmarczak/http-timer@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" - integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA== + "integrity" "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==" + "resolved" "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz" + "version" "1.1.2" dependencies: - defer-to-connect "^1.0.1" + "defer-to-connect" "^1.0.1" "@szmarczak/http-timer@^4.0.5": - version "4.0.5" - resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.5.tgz#bfbd50211e9dfa51ba07da58a14cdfd333205152" - integrity sha512-PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ== + "integrity" "sha512-PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ==" + "resolved" "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.5.tgz" + "version" "4.0.5" dependencies: - defer-to-connect "^2.0.0" + "defer-to-connect" "^2.0.0" "@types/braces@*": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@types/braces/-/braces-3.0.0.tgz#7da1c0d44ff1c7eb660a36ec078ea61ba7eb42cb" - integrity sha512-TbH79tcyi9FHwbyboOKeRachRq63mSuWYXOflsNO9ZyE5ClQ/JaozNKl+aWUq87qPNsXasXxi2AbgfwIJ+8GQw== + "integrity" "sha512-TbH79tcyi9FHwbyboOKeRachRq63mSuWYXOflsNO9ZyE5ClQ/JaozNKl+aWUq87qPNsXasXxi2AbgfwIJ+8GQw==" + "resolved" "https://registry.npmjs.org/@types/braces/-/braces-3.0.0.tgz" + "version" "3.0.0" "@types/cacheable-request@^6.0.1": - version "6.0.1" - resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.1.tgz#5d22f3dded1fd3a84c0bbeb5039a7419c2c91976" - integrity sha512-ykFq2zmBGOCbpIXtoVbz4SKY5QriWPh3AjyU4G74RYbtt5yOc5OfaY75ftjg7mikMOla1CTGpX3lLbuJh8DTrQ== + "integrity" "sha512-ykFq2zmBGOCbpIXtoVbz4SKY5QriWPh3AjyU4G74RYbtt5yOc5OfaY75ftjg7mikMOla1CTGpX3lLbuJh8DTrQ==" + "resolved" "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.1.tgz" + "version" "6.0.1" dependencies: "@types/http-cache-semantics" "*" "@types/keyv" "*" @@ -404,6780 +448,7001 @@ "@types/responselike" "*" "@types/color-name@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0" - integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ== + "integrity" "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==" + "resolved" "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz" + "version" "1.1.1" "@types/debug@^4.1.4": - version "4.1.5" - resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.5.tgz#b14efa8852b7768d898906613c23f688713e02cd" - integrity sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ== + "integrity" "sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ==" + "resolved" "https://registry.npmjs.org/@types/debug/-/debug-4.1.5.tgz" + "version" "4.1.5" "@types/estree@0.0.39": - version "0.0.39" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f" - integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw== + "integrity" "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==" + "resolved" "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz" + "version" "0.0.39" "@types/flat-cache@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@types/flat-cache/-/flat-cache-2.0.0.tgz#64e5d3b426c392b603a208a55bdcc7d920ce6e57" - integrity sha512-fHeEsm9hvmZ+QHpw6Fkvf19KIhuqnYLU6vtWLjd5BsMd/qVi7iTkMioDZl0mQmfNRA1A6NwvhrSRNr9hGYZGww== + "integrity" "sha512-fHeEsm9hvmZ+QHpw6Fkvf19KIhuqnYLU6vtWLjd5BsMd/qVi7iTkMioDZl0mQmfNRA1A6NwvhrSRNr9hGYZGww==" + "resolved" "https://registry.npmjs.org/@types/flat-cache/-/flat-cache-2.0.0.tgz" + "version" "2.0.0" "@types/graphlib@^2", "@types/graphlib@^2.1.7": - version "2.1.7" - resolved "https://registry.yarnpkg.com/@types/graphlib/-/graphlib-2.1.7.tgz#e6a47a4f43511f5bad30058a669ce5ce93bfd823" - integrity sha512-K7T1n6U2HbTYu+SFHlBjz/RH74OA2D/zF1qlzn8uXbvB4uRg7knOM85ugS2bbXI1TXMh7rLqk4OVRwIwEBaixg== + "integrity" "sha512-K7T1n6U2HbTYu+SFHlBjz/RH74OA2D/zF1qlzn8uXbvB4uRg7knOM85ugS2bbXI1TXMh7rLqk4OVRwIwEBaixg==" + "resolved" "https://registry.npmjs.org/@types/graphlib/-/graphlib-2.1.7.tgz" + "version" "2.1.7" "@types/http-cache-semantics@*": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.0.tgz#9140779736aa2655635ee756e2467d787cfe8a2a" - integrity sha512-c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A== + "integrity" "sha512-c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A==" + "resolved" "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.0.tgz" + "version" "4.0.0" "@types/js-yaml@^3.12.1": - version "3.12.2" - resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.12.2.tgz#a35a1809c33a68200fb6403d1ad708363c56470a" - integrity sha512-0CFu/g4mDSNkodVwWijdlr8jH7RoplRWNgovjFLEZeT+QEbbZXjBmCe3HwaWheAlCbHwomTwzZoSedeOycABug== + "integrity" "sha512-0CFu/g4mDSNkodVwWijdlr8jH7RoplRWNgovjFLEZeT+QEbbZXjBmCe3HwaWheAlCbHwomTwzZoSedeOycABug==" + "resolved" "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.12.2.tgz" + "version" "3.12.2" "@types/keyv@*": - version "3.1.1" - resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.1.tgz#e45a45324fca9dab716ab1230ee249c9fb52cfa7" - integrity sha512-MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw== + "integrity" "sha512-MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw==" + "resolved" "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.1.tgz" + "version" "3.1.1" dependencies: "@types/node" "*" "@types/lodash.chunk@^4.2.6": - version "4.2.6" - resolved "https://registry.yarnpkg.com/@types/lodash.chunk/-/lodash.chunk-4.2.6.tgz#9d35f05360b0298715d7f3d9efb34dd4f77e5d2a" - integrity sha512-SPlusB7jxXyGcTXYcUdWr7WmhArO/rmTq54VN88iKMxGUhyg79I4Q8n4riGn3kjaTjOJrVlHhxgX/d7woak5BQ== + "integrity" "sha512-SPlusB7jxXyGcTXYcUdWr7WmhArO/rmTq54VN88iKMxGUhyg79I4Q8n4riGn3kjaTjOJrVlHhxgX/d7woak5BQ==" + "resolved" "https://registry.npmjs.org/@types/lodash.chunk/-/lodash.chunk-4.2.6.tgz" + "version" "4.2.6" dependencies: "@types/lodash" "*" "@types/lodash.omit@^4.5.6": - version "4.5.6" - resolved "https://registry.yarnpkg.com/@types/lodash.omit/-/lodash.omit-4.5.6.tgz#f2a9518259e481a48ff7ec423420fa8fd58933e2" - integrity sha512-KXPpOSNX2h0DAG2w7ajpk7TXvWF28ZHs5nJhOJyP0BQHkehgr948RVsToItMme6oi0XJkp19CbuNXkIX8FiBlQ== + "integrity" "sha512-KXPpOSNX2h0DAG2w7ajpk7TXvWF28ZHs5nJhOJyP0BQHkehgr948RVsToItMme6oi0XJkp19CbuNXkIX8FiBlQ==" + "resolved" "https://registry.npmjs.org/@types/lodash.omit/-/lodash.omit-4.5.6.tgz" + "version" "4.5.6" dependencies: "@types/lodash" "*" "@types/lodash.union@^4.6.6": - version "4.6.6" - resolved "https://registry.yarnpkg.com/@types/lodash.union/-/lodash.union-4.6.6.tgz#2f77f2088326ed147819e9e384182b99aae8d4b0" - integrity sha512-Wu0ZEVNcyCz8eAn6TlUbYWZoGbH9E+iOHxAZbwUoCEXdUiy6qpcz5o44mMXViM4vlPLLCPlkAubEP1gokoSZaw== + "integrity" "sha512-Wu0ZEVNcyCz8eAn6TlUbYWZoGbH9E+iOHxAZbwUoCEXdUiy6qpcz5o44mMXViM4vlPLLCPlkAubEP1gokoSZaw==" + "resolved" "https://registry.npmjs.org/@types/lodash.union/-/lodash.union-4.6.6.tgz" + "version" "4.6.6" dependencies: "@types/lodash" "*" "@types/lodash@*": - version "4.14.168" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.168.tgz#fe24632e79b7ade3f132891afff86caa5e5ce008" - integrity sha512-oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q== + "integrity" "sha512-oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q==" + "resolved" "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.168.tgz" + "version" "4.14.168" "@types/micromatch@^4.0.1": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@types/micromatch/-/micromatch-4.0.1.tgz#9381449dd659fc3823fd2a4190ceacc985083bc7" - integrity sha512-my6fLBvpY70KattTNzYOK6KU1oR1+UCz9ug/JbcF5UrEmeCt9P7DV2t7L8+t18mMPINqGQCE4O8PLOPbI84gxw== + "integrity" "sha512-my6fLBvpY70KattTNzYOK6KU1oR1+UCz9ug/JbcF5UrEmeCt9P7DV2t7L8+t18mMPINqGQCE4O8PLOPbI84gxw==" + "resolved" "https://registry.npmjs.org/@types/micromatch/-/micromatch-4.0.1.tgz" + "version" "4.0.1" dependencies: "@types/braces" "*" "@types/node@*": - version "13.7.4" - resolved "https://registry.yarnpkg.com/@types/node/-/node-13.7.4.tgz#76c3cb3a12909510f52e5dc04a6298cdf9504ffd" - integrity sha512-oVeL12C6gQS/GAExndigSaLxTrKpQPxewx9bOcwfvJiJge4rr7wNaph4J+ns5hrmIV2as5qxqN8YKthn9qh0jw== + "integrity" "sha512-oVeL12C6gQS/GAExndigSaLxTrKpQPxewx9bOcwfvJiJge4rr7wNaph4J+ns5hrmIV2as5qxqN8YKthn9qh0jw==" + "resolved" "https://registry.npmjs.org/@types/node/-/node-13.7.4.tgz" + "version" "13.7.4" "@types/node@^11.9.5": - version "11.10.4" - resolved "https://registry.yarnpkg.com/@types/node/-/node-11.10.4.tgz#3f5fc4f0f322805f009e00ab35a2ff3d6b778e42" - integrity sha512-wa09itaLE8L705aXd8F80jnFpxz3Y1/KRHfKsYL2bPc0XF+wEWu8sR9n5bmeu8Ba1N9z2GRNzm/YdHcghLkLKg== + "integrity" "sha512-wa09itaLE8L705aXd8F80jnFpxz3Y1/KRHfKsYL2bPc0XF+wEWu8sR9n5bmeu8Ba1N9z2GRNzm/YdHcghLkLKg==" + "resolved" "https://registry.npmjs.org/@types/node/-/node-11.10.4.tgz" + "version" "11.10.4" "@types/q@^1.5.1": - version "1.5.1" - resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.1.tgz#48fd98c1561fe718b61733daed46ff115b496e18" - integrity sha512-eqz8c/0kwNi/OEHQfvIuJVLTst3in0e7uTKeuY+WL/zfKn0xVujOTp42bS/vUUokhK5P2BppLd9JXMOMHcgbjA== + "integrity" "sha512-eqz8c/0kwNi/OEHQfvIuJVLTst3in0e7uTKeuY+WL/zfKn0xVujOTp42bS/vUUokhK5P2BppLd9JXMOMHcgbjA==" + "resolved" "https://registry.npmjs.org/@types/q/-/q-1.5.1.tgz" + "version" "1.5.1" "@types/responselike@*", "@types/responselike@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29" - integrity sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA== + "integrity" "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==" + "resolved" "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz" + "version" "1.0.0" dependencies: "@types/node" "*" "@types/sarif@^2.1.3": - version "2.1.3" - resolved "https://registry.yarnpkg.com/@types/sarif/-/sarif-2.1.3.tgz#1f9c16033f1461536ac014284920350109614c02" - integrity sha512-zf+EoIplTkQW2TV2mwtJtlI0g540Z3Rs9tX9JqRAtyjnDCqkP+eMTgWCj3PGNbQpi+WXAjvC3Ou/dvvX2sLK4w== + "integrity" "sha512-zf+EoIplTkQW2TV2mwtJtlI0g540Z3Rs9tX9JqRAtyjnDCqkP+eMTgWCj3PGNbQpi+WXAjvC3Ou/dvvX2sLK4w==" + "resolved" "https://registry.npmjs.org/@types/sarif/-/sarif-2.1.3.tgz" + "version" "2.1.3" "@types/uuid@^8.3.0": - version "8.3.0" - resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.0.tgz#215c231dff736d5ba92410e6d602050cce7e273f" - integrity sha512-eQ9qFW/fhfGJF8WKHGEHZEyVWfZxrT+6CLIJGBcZPfxUh/+BnEj+UCGYMlr9qZuX/2AltsvwrGqp0LhEW8D0zQ== + "integrity" "sha512-eQ9qFW/fhfGJF8WKHGEHZEyVWfZxrT+6CLIJGBcZPfxUh/+BnEj+UCGYMlr9qZuX/2AltsvwrGqp0LhEW8D0zQ==" + "resolved" "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.0.tgz" + "version" "8.3.0" "@vue/component-compiler-utils@^1.2.1": - version "1.3.1" - resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-1.3.1.tgz#686f0b913d59590ae327b2a1cb4b6d9b931bbe0e" - integrity sha512-IyjJW6ToMitgAhp3xh22QiEW8JvHfLyzlyY/J+GjJ71miod9tNsy6xT2ckm/VirlhPMfeM43kgYZe34jhmmzpw== - dependencies: - consolidate "^0.15.1" - hash-sum "^1.0.2" - lru-cache "^4.1.2" - merge-source-map "^1.1.0" - postcss "^6.0.20" - postcss-selector-parser "^3.1.1" - prettier "^1.13.0" - source-map "^0.5.6" - vue-template-es2015-compiler "^1.6.0" + "integrity" "sha512-IyjJW6ToMitgAhp3xh22QiEW8JvHfLyzlyY/J+GjJ71miod9tNsy6xT2ckm/VirlhPMfeM43kgYZe34jhmmzpw==" + "resolved" "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-1.3.1.tgz" + "version" "1.3.1" + dependencies: + "consolidate" "^0.15.1" + "hash-sum" "^1.0.2" + "lru-cache" "^4.1.2" + "merge-source-map" "^1.1.0" + "postcss" "^6.0.20" + "postcss-selector-parser" "^3.1.1" + "prettier" "^1.13.0" + "source-map" "^0.5.6" + "vue-template-es2015-compiler" "^1.6.0" "@vue/component-compiler-utils@^2.1.0": - version "2.6.0" - resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-2.6.0.tgz#aa46d2a6f7647440b0b8932434d22f12371e543b" - integrity sha512-IHjxt7LsOFYc0DkTncB7OXJL7UzwOLPPQCfEUNyxL2qt+tF12THV+EO33O1G2Uk4feMSWua3iD39Itszx0f0bw== - dependencies: - consolidate "^0.15.1" - hash-sum "^1.0.2" - lru-cache "^4.1.2" - merge-source-map "^1.1.0" - postcss "^7.0.14" - postcss-selector-parser "^5.0.0" - prettier "1.16.3" - source-map "~0.6.1" - vue-template-es2015-compiler "^1.9.0" + "integrity" "sha512-IHjxt7LsOFYc0DkTncB7OXJL7UzwOLPPQCfEUNyxL2qt+tF12THV+EO33O1G2Uk4feMSWua3iD39Itszx0f0bw==" + "resolved" "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-2.6.0.tgz" + "version" "2.6.0" + dependencies: + "consolidate" "^0.15.1" + "hash-sum" "^1.0.2" + "lru-cache" "^4.1.2" + "merge-source-map" "^1.1.0" + "postcss" "^7.0.14" + "postcss-selector-parser" "^5.0.0" + "prettier" "1.16.3" + "source-map" "~0.6.1" + "vue-template-es2015-compiler" "^1.9.0" "@vue/component-compiler@^3.3.2": - version "3.6.0" - resolved "https://registry.yarnpkg.com/@vue/component-compiler/-/component-compiler-3.6.0.tgz#8db313e50eaa2903cef5aac68c37a09364dba79d" - integrity sha512-NIA0vmOI4zbtJAn69iZls8IJ8VxmguswAuiUdu8TcR+YYTYzntfw290HUCSFjzAdRg+FUWZv8r+wc3TzJ/IjwA== + "integrity" "sha512-NIA0vmOI4zbtJAn69iZls8IJ8VxmguswAuiUdu8TcR+YYTYzntfw290HUCSFjzAdRg+FUWZv8r+wc3TzJ/IjwA==" + "resolved" "https://registry.npmjs.org/@vue/component-compiler/-/component-compiler-3.6.0.tgz" + "version" "3.6.0" dependencies: "@vue/component-compiler-utils" "^2.1.0" - clean-css "^4.1.11" - hash-sum "^1.0.2" - postcss-modules-sync "^1.0.0" - source-map "0.6.*" + "clean-css" "^4.1.11" + "hash-sum" "^1.0.2" + "postcss-modules-sync" "^1.0.0" + "source-map" "0.6.*" "@yarnpkg/lockfile@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" - integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ== - -abbrev@1, abbrev@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" - integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== - -accepts@~1.3.4, accepts@~1.3.7: - version "1.3.7" - resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" - integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA== - dependencies: - mime-types "~2.1.24" - negotiator "0.6.2" - -ace-builds@^1.4.8: - version "1.4.8" - resolved "https://registry.yarnpkg.com/ace-builds/-/ace-builds-1.4.8.tgz#d14be41d30294a2a12581f0bcfee4b696481ffdd" - integrity sha512-8ZVAxwyCGAxQX8mOp9imSXH0hoSPkGfy8igJy+WO/7axL30saRhKgg1XPACSmxxPA7nfHVwM+ShWXT+vKsNuFg== - -acorn@^5.2.1: - version "5.7.4" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e" - integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg== - -acorn@^6.1.1: - version "6.1.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f" - integrity sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA== - -after@0.8.2: - version "0.8.2" - resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f" - integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8= - -aggregate-error@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" - integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== - dependencies: - clean-stack "^2.0.0" - indent-string "^4.0.0" + "integrity" "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==" + "resolved" "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz" + "version" "1.1.0" + +"abbrev@^1.1.1", "abbrev@1": + "integrity" "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" + "resolved" "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz" + "version" "1.1.1" + +"accepts@~1.3.4", "accepts@~1.3.7": + "integrity" "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==" + "resolved" "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz" + "version" "1.3.7" + dependencies: + "mime-types" "~2.1.24" + "negotiator" "0.6.2" + +"ace-builds@^1.4.8": + "integrity" "sha512-8ZVAxwyCGAxQX8mOp9imSXH0hoSPkGfy8igJy+WO/7axL30saRhKgg1XPACSmxxPA7nfHVwM+ShWXT+vKsNuFg==" + "resolved" "https://registry.npmjs.org/ace-builds/-/ace-builds-1.4.8.tgz" + "version" "1.4.8" + +"acorn@^5.2.1": + "integrity" "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==" + "resolved" "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz" + "version" "5.7.4" + +"acorn@^6.1.1": + "integrity" "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==" + "resolved" "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz" + "version" "6.4.2" + +"after@0.8.2": + "integrity" "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=" + "resolved" "https://registry.npmjs.org/after/-/after-0.8.2.tgz" + "version" "0.8.2" + +"aggregate-error@^3.0.0": + "integrity" "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==" + "resolved" "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz" + "version" "3.1.0" + dependencies: + "clean-stack" "^2.0.0" + "indent-string" "^4.0.0" "air-datepicker@github:frappe/air-datepicker": - version "2.2.3" - resolved "https://codeload.github.com/frappe/air-datepicker/tar.gz/ed37b94d95c68d8544357e330be0c89d044a3eea" - dependencies: - jquery ">=2.0.0 <4.0.0" - -ajv@^6.12.3: - version "6.12.5" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.5.tgz#19b0e8bae8f476e5ba666300387775fb1a00a4da" - integrity sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag== - dependencies: - fast-deep-equal "^3.1.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" - uri-js "^4.2.2" - -alphanum-sort@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" - integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM= - -amdefine@>=0.0.4: - version "1.0.1" - resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" - integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU= - -ansi-align@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz#b536b371cf687caaef236c18d3e21fe3797467cb" - integrity sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw== - dependencies: - string-width "^3.0.0" - -ansi-escapes@3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b" - integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ== - -ansi-escapes@^4.2.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61" - integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA== - dependencies: - type-fest "^0.11.0" - -ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= - -ansi-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" - integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= - -ansi-regex@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" - integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== - -ansi-regex@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" - integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== - -ansi-styles@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" - integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= - -ansi-styles@^3.2.0, ansi-styles@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" - integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== - dependencies: - color-convert "^1.9.0" - -ansi-styles@^4.1.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359" - integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA== + "resolved" "git+ssh://git@github.com/frappe/air-datepicker.git#ed37b94d95c68d8544357e330be0c89d044a3eea" + "version" "2.2.3" + dependencies: + "jquery" ">=2.0.0 <4.0.0" + +"ajv@^6.12.3": + "integrity" "sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==" + "resolved" "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz" + "version" "6.12.5" + dependencies: + "fast-deep-equal" "^3.1.1" + "fast-json-stable-stringify" "^2.0.0" + "json-schema-traverse" "^0.4.1" + "uri-js" "^4.2.2" + +"alphanum-sort@^1.0.0": + "integrity" "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=" + "resolved" "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz" + "version" "1.0.2" + +"amdefine@>=0.0.4": + "integrity" "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" + "resolved" "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz" + "version" "1.0.1" + +"ansi-align@^3.0.0": + "integrity" "sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==" + "resolved" "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz" + "version" "3.0.0" + dependencies: + "string-width" "^3.0.0" + +"ansi-escapes@^4.2.1": + "integrity" "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==" + "resolved" "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz" + "version" "4.3.1" + dependencies: + "type-fest" "^0.11.0" + +"ansi-escapes@3.2.0": + "integrity" "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==" + "resolved" "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz" + "version" "3.2.0" + +"ansi-regex@^2.0.0": + "integrity" "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + "resolved" "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz" + "version" "2.1.1" + +"ansi-regex@^3.0.0": + "integrity" "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" + "resolved" "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz" + "version" "3.0.0" + +"ansi-regex@^4.1.0": + "integrity" "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" + "resolved" "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz" + "version" "4.1.0" + +"ansi-regex@^5.0.0": + "integrity" "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" + "resolved" "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz" + "version" "5.0.0" + +"ansi-styles@^2.2.1": + "integrity" "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" + "resolved" "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz" + "version" "2.2.1" + +"ansi-styles@^3.2.0", "ansi-styles@^3.2.1": + "integrity" "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==" + "resolved" "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz" + "version" "3.2.1" + dependencies: + "color-convert" "^1.9.0" + +"ansi-styles@^4.1.0": + "integrity" "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==" + "resolved" "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz" + "version" "4.2.1" dependencies: "@types/color-name" "^1.1.1" - color-convert "^2.0.1" - -ansicolors@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979" - integrity sha1-ZlWX3oap/+Oqm/vmyuXG6kJrSXk= - -aproba@^1.0.3: - version "1.2.0" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" - integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== - -archy@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40" - integrity sha1-+cjBN1fMHde8N5rHeyxipcKGjEA= - -are-we-there-yet@~1.1.2: - version "1.1.5" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21" - integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w== - dependencies: - delegates "^1.0.0" - readable-stream "^2.0.6" - -argparse@^1.0.7: - version "1.0.10" - resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" - integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== - dependencies: - sprintf-js "~1.0.2" - -arr-diff@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" - integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA= - -arr-flatten@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" - integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg== - -arr-union@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" - integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= - -array-filter@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-1.0.0.tgz#baf79e62e6ef4c2a4c0b831232daffec251f9d83" - integrity sha1-uveeYubvTCpMC4MSMtr/7CUfnYM= - -array-find-index@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1" - integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E= - -array-flatten@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" - integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= - -array-unique@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" - integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= - -arraybuffer.slice@~0.0.7: - version "0.0.7" - resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675" - integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog== - -asap@~2.0.3: - version "2.0.6" - resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" - integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY= - -asn1@~0.2.0, asn1@~0.2.3: - version "0.2.4" - resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136" - integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg== - dependencies: - safer-buffer "~2.1.0" - -assert-plus@1.0.0, assert-plus@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" - integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= - -assign-symbols@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" - integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c= - -async-array-reduce@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/async-array-reduce/-/async-array-reduce-0.2.1.tgz#c8be010a2b5cd00dea96c81116034693dfdd82d1" - integrity sha1-yL4BCitc0A3qlsgRFgNGk9/dgtE= - -async-foreach@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542" - integrity sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI= - -async@^2.6.1: - version "2.6.3" - resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff" - integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg== - dependencies: - lodash "^4.17.14" - -async@^3.1.0, async@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720" - integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw== - -asynckit@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" - integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= - -atob@^2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" - integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== - -autoprefixer@^9.8.6: - version "9.8.6" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz#3b73594ca1bf9266320c5acf1588d74dea74210f" - integrity sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg== - dependencies: - browserslist "^4.12.0" - caniuse-lite "^1.0.30001109" - colorette "^1.2.1" - normalize-range "^0.1.2" - num2fraction "^1.2.2" - postcss "^7.0.32" - postcss-value-parser "^4.1.0" - -available-typed-arrays@^1.0.0, available-typed-arrays@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.2.tgz#6b098ca9d8039079ee3f77f7b783c4480ba513f5" - integrity sha512-XWX3OX8Onv97LMk/ftVyBibpGwY5a8SmuxZPzeOxqmuEqUCOM9ZE+uIaD1VNJ5QnvU2UQusvmKbuM1FR8QWGfQ== - dependencies: - array-filter "^1.0.0" - -awesomplete@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/awesomplete/-/awesomplete-1.1.5.tgz#1b2b5dd106d3955595619c03da472a1dc0faf0af" - integrity sha512-UFw1mPW8NaSECDSTC36HbAOTpF9JK2wBUJcNn4MSvlNtK7SZ9N72gB+ajHtA6D1abYXRcszZnBA4nHBwvFwzHw== - -aws-sign2@~0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" - integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= - -aws4@^1.8.0: - version "1.10.1" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.1.tgz#e1e82e4f3e999e2cfd61b161280d16a111f86428" - integrity sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA== - -axios@^0.21.1: - version "0.21.1" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8" - integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA== - dependencies: - follow-redirects "^1.10.0" - -babel-runtime@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" - integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4= - dependencies: - core-js "^2.4.0" - regenerator-runtime "^0.11.0" - -backo2@1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947" - integrity sha1-MasayLEpNjRj41s+u2n038+6eUc= - -balanced-match@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" - integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= - -base64-arraybuffer@0.1.5: - version "0.1.5" - resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8" - integrity sha1-c5JncZI7Whl0etZmqlzUv5xunOg= - -base64-js@^1.0.2: - version "1.3.1" - resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1" - integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g== - -base64id@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6" - integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog== - -base@^0.11.1: - version "0.11.2" - resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" - integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg== - dependencies: - cache-base "^1.0.1" - class-utils "^0.3.5" - component-emitter "^1.2.1" - define-property "^1.0.0" - isobject "^3.0.1" - mixin-deep "^1.2.0" - pascalcase "^0.1.1" - -bcrypt-pbkdf@^1.0.0, bcrypt-pbkdf@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" - integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4= - dependencies: - tweetnacl "^0.14.3" - -big.js@^3.1.3: - version "3.2.0" - resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e" - integrity sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q== - -bl@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/bl/-/bl-3.0.1.tgz#1cbb439299609e419b5a74d7fce2f8b37d8e5c6f" - integrity sha512-jrCW5ZhfQ/Vt07WX1Ngs+yn9BDqPL/gw28S7s9H6QK/gupnizNzJAss5akW20ISgOrbLTlXOOCTJeNUQqruAWQ== - dependencies: - readable-stream "^3.0.1" - -bl@^4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.2.tgz#52b71e9088515d0606d9dd9cc7aa48dc1f98e73a" - integrity sha512-j4OH8f6Qg2bGuWfRiltT2HYGx0e1QcBTrK9KAHNMwMZdQnDZFk0ZSYIpADjYCB3U12nicC5tVJwSIhwOWjb4RQ== - dependencies: - buffer "^5.5.0" - inherits "^2.0.4" - readable-stream "^3.4.0" - -bl@^4.0.3: - version "4.1.0" - resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" - integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== - dependencies: - buffer "^5.5.0" - inherits "^2.0.4" - readable-stream "^3.4.0" - -blob@0.0.5: - version "0.0.5" - resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683" - integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig== - -block-stream@*: - version "0.0.9" - resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a" - integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo= - dependencies: - inherits "~2.0.0" - -bluebird@^3.1.1: - version "3.5.3" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7" - integrity sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw== - -body-parser@1.19.0: - version "1.19.0" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" - integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw== - dependencies: - bytes "3.1.0" - content-type "~1.0.4" - debug "2.6.9" - depd "~1.1.2" - http-errors "1.7.2" - iconv-lite "0.4.24" - on-finished "~2.3.0" - qs "6.7.0" - raw-body "2.4.0" - type-is "~1.6.17" - -boolbase@^1.0.0, boolbase@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" - integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24= - -boolean@^3.0.1: - version "3.0.3" - resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.0.3.tgz#0fee0c9813b66bef25a8a6a904bb46736d05f024" - integrity sha512-EqrTKXQX6Z3A2nRmMEIlAIfjQOgFnVO2nqZGpbcsPnYGWBwpFqzlrozU1dy+S2iqfYDLh26ef4KrgTxu9xQrxA== - -bootstrap@4: - version "4.5.0" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.5.0.tgz#97d9dbcb5a8972f8722c9962483543b907d9b9ec" - integrity sha512-Z93QoXvodoVslA+PWNdk23Hze4RBYIkpb5h8I2HY2Tu2h7A0LpAgLcyrhrSUyo2/Oxm2l1fRZPs1e5hnxnliXA== - -boxen@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/boxen/-/boxen-4.2.0.tgz#e411b62357d6d6d36587c8ac3d5d974daa070e64" - integrity sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ== - dependencies: - ansi-align "^3.0.0" - camelcase "^5.3.1" - chalk "^3.0.0" - cli-boxes "^2.2.0" - string-width "^4.1.0" - term-size "^2.1.0" - type-fest "^0.8.1" - widest-line "^3.1.0" - -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - -braces@^2.3.1: - version "2.3.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" - integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w== - dependencies: - arr-flatten "^1.1.0" - array-unique "^0.3.2" - extend-shallow "^2.0.1" - fill-range "^4.0.0" - isobject "^3.0.1" - repeat-element "^1.1.2" - snapdragon "^0.8.1" - snapdragon-node "^2.0.1" - split-string "^3.0.2" - to-regex "^3.0.1" - -braces@^3.0.1: - version "3.0.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" - integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== - dependencies: - fill-range "^7.0.1" - -browser-stdout@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60" - integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw== - -browserify-zlib@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.1.4.tgz#bb35f8a519f600e0fa6b8485241c979d0141fb2d" - integrity sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0= - dependencies: - pako "~0.2.0" - -browserslist@^4.0.0: - version "4.4.2" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.4.2.tgz#6ea8a74d6464bb0bd549105f659b41197d8f0ba2" - integrity sha512-ISS/AIAiHERJ3d45Fz0AVYKkgcy+F/eJHzKEvv1j0wwKGKD9T3BrwKr/5g45L+Y4XIK5PlTqefHciRFcfE1Jxg== - dependencies: - caniuse-lite "^1.0.30000939" - electron-to-chromium "^1.3.113" - node-releases "^1.1.8" - -browserslist@^4.12.0: - version "4.14.0" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.0.tgz#2908951abfe4ec98737b72f34c3bcedc8d43b000" - integrity sha512-pUsXKAF2lVwhmtpeA3LJrZ76jXuusrNyhduuQs7CDFf9foT4Y38aQOserd2lMe5DSSrjf3fx34oHwryuvxAUgQ== - dependencies: - caniuse-lite "^1.0.30001111" - electron-to-chromium "^1.3.523" - escalade "^3.0.2" - node-releases "^1.1.60" - -buble@^0.19.6: - version "0.19.6" - resolved "https://registry.yarnpkg.com/buble/-/buble-0.19.6.tgz#915909b6bd5b11ee03b1c885ec914a8b974d34d3" - integrity sha512-9kViM6nJA1Q548Jrd06x0geh+BG2ru2+RMDkIHHgJY/8AcyCs34lTHwra9BX7YdPrZXd5aarkpr/SY8bmPgPdg== - dependencies: - chalk "^2.4.1" - magic-string "^0.25.1" - minimist "^1.2.0" - os-homedir "^1.0.1" - regexpu-core "^4.2.0" - vlq "^1.0.0" - -buffer-crc32@~0.2.3: - version "0.2.13" - resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" - integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= - -buffer-from@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" - integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== - -buffer@^5.5.0: - version "5.6.0" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.6.0.tgz#a31749dc7d81d84db08abf937b6b8c4033f62786" - integrity sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw== - dependencies: - base64-js "^1.0.2" - ieee754 "^1.1.4" - -builtin-modules@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.0.0.tgz#1e587d44b006620d90286cc7a9238bbc6129cab1" - integrity sha512-hMIeU4K2ilbXV6Uv93ZZ0Avg/M91RaKXucQ+4me2Do1txxBDyDZWCBa5bJSLqoNTRpXTLwEzIk1KmloenDDjhg== - -bytes@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" - integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== - -cache-base@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" - integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ== - dependencies: - collection-visit "^1.0.0" - component-emitter "^1.2.1" - get-value "^2.0.6" - has-value "^1.0.0" - isobject "^3.0.1" - set-value "^2.0.0" - to-object-path "^0.3.0" - union-value "^1.0.0" - unset-value "^1.0.0" - -cacheable-lookup@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.3.tgz#049fdc59dffdd4fc285e8f4f82936591bd59fec3" - integrity sha512-W+JBqF9SWe18A72XFzN/V/CULFzPm7sBXzzR6ekkE+3tLG72wFZrBiBZhrZuDoYexop4PHJVdFAKb/Nj9+tm9w== - -cacheable-request@^6.0.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912" - integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg== - dependencies: - clone-response "^1.0.2" - get-stream "^5.1.0" - http-cache-semantics "^4.0.0" - keyv "^3.0.0" - lowercase-keys "^2.0.0" - normalize-url "^4.1.0" - responselike "^1.0.2" - -cacheable-request@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.1.tgz#062031c2856232782ed694a257fa35da93942a58" - integrity sha512-lt0mJ6YAnsrBErpTMWeu5kl/tg9xMAWjavYTN6VQXM1A/teBITuNcccXsCxF0tDQQJf9DfAaX5O4e0zp0KlfZw== - dependencies: - clone-response "^1.0.2" - get-stream "^5.1.0" - http-cache-semantics "^4.0.0" - keyv "^4.0.0" - lowercase-keys "^2.0.0" - normalize-url "^4.1.0" - responselike "^2.0.0" - -caller-callsite@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134" - integrity sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ= - dependencies: - callsites "^2.0.0" - -caller-path@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4" - integrity sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ= - dependencies: - caller-callsite "^2.0.0" - -callsites@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50" - integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA= - -camelcase-keys@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7" - integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc= - dependencies: - camelcase "^2.0.0" - map-obj "^1.0.0" - -camelcase@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" - integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8= - -camelcase@^5.0.0, camelcase@^5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" - integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== - -caniuse-api@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0" - integrity sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw== - dependencies: - browserslist "^4.0.0" - caniuse-lite "^1.0.0" - lodash.memoize "^4.1.2" - lodash.uniq "^4.5.0" - -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000939, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001111: - version "1.0.30001191" - resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001191.tgz" - integrity sha512-xJJqzyd+7GCJXkcoBiQ1GuxEiOBCLQ0aVW9HMekifZsAVGdj5eJ4mFB9fEhSHipq9IOk/QXFJUiIr9lZT+EsGw== - -caseless@~0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" - integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= - -chalk@4.1.0, chalk@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" - integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - -chalk@^1.1.1, chalk@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" - integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= - dependencies: - ansi-styles "^2.2.1" - escape-string-regexp "^1.0.2" - has-ansi "^2.0.0" - strip-ansi "^3.0.0" - supports-color "^2.0.0" - -chalk@^2.0.0, chalk@^2.3.2, chalk@^2.4.1, chalk@^2.4.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" - integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - -chalk@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" - integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - -chardet@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" - integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA== - -child-process@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/child-process/-/child-process-1.0.2.tgz#98974dc7ed1ee4c6229f8e305fa7313a6885a7f2" - integrity sha1-mJdNx+0e5MYin44wX6cxOmiFp/I= - -chownr@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" - integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== - -ci-info@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" - integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== - -class-utils@^0.3.5: - version "0.3.6" - resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" - integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg== - dependencies: - arr-union "^3.1.0" - define-property "^0.2.5" - isobject "^3.0.0" - static-extend "^0.1.1" - -clean-css@^4.1.11: - version "4.2.1" - resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.1.tgz#2d411ef76b8569b6d0c84068dabe85b0aa5e5c17" - integrity sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g== - dependencies: - source-map "~0.6.0" - -clean-stack@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" - integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== - -cli-boxes@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.0.tgz#538ecae8f9c6ca508e3c3c95b453fe93cb4c168d" - integrity sha512-gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w== - -cli-cursor@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307" - integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw== - dependencies: - restore-cursor "^3.1.0" - -cli-spinner@0.2.10: - version "0.2.10" - resolved "https://registry.yarnpkg.com/cli-spinner/-/cli-spinner-0.2.10.tgz#f7d617a36f5c47a7bc6353c697fc9338ff782a47" - integrity sha512-U0sSQ+JJvSLi1pAYuJykwiA8Dsr15uHEy85iCJ6A+0DjVxivr3d+N2Wjvodeg89uP5K6TswFkKBfAD7B3YSn/Q== - -cli-spinners@^2.5.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.0.tgz#36c7dc98fb6a9a76bd6238ec3f77e2425627e939" - integrity sha512-t+4/y50K/+4xcCRosKkA7W4gTr1MySvLV0q+PxmG7FJ5g+66ChKurYjxBCjHggHH3HA5Hh9cy+lcUGWDqVH+4Q== - -cli-width@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6" - integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw== - -cliui@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49" - integrity sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ== - dependencies: - string-width "^2.1.1" - strip-ansi "^4.0.0" - wrap-ansi "^2.0.0" - -cliui@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5" - integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA== - dependencies: - string-width "^3.1.0" - strip-ansi "^5.2.0" - wrap-ansi "^5.1.0" - -clone-buffer@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58" - integrity sha1-4+JbIHrE5wGvch4staFnksrD3Fg= - -clone-response@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b" - integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws= - dependencies: - mimic-response "^1.0.0" - -clone-stats@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680" - integrity sha1-s3gt/4u1R04Yuba/D9/ngvh3doA= - -clone@^1.0.2: - version "1.0.4" - resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" - integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4= - -clone@^2.1.1, clone@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" - integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18= - -cloneable-readable@^1.0.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.3.tgz#120a00cb053bfb63a222e709f9683ea2e11d8cec" - integrity sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ== - dependencies: - inherits "^2.0.1" - process-nextick-args "^2.0.0" - readable-stream "^2.3.5" - -coa@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3" - integrity sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA== + "color-convert" "^2.0.1" + +"ansicolors@^0.3.2": + "integrity" "sha1-ZlWX3oap/+Oqm/vmyuXG6kJrSXk=" + "resolved" "https://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz" + "version" "0.3.2" + +"aproba@^1.0.3": + "integrity" "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" + "resolved" "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz" + "version" "1.2.0" + +"archy@^1.0.0": + "integrity" "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=" + "resolved" "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz" + "version" "1.0.0" + +"are-we-there-yet@~1.1.2": + "integrity" "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==" + "resolved" "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz" + "version" "1.1.5" + dependencies: + "delegates" "^1.0.0" + "readable-stream" "^2.0.6" + +"argparse@^1.0.7": + "integrity" "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==" + "resolved" "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz" + "version" "1.0.10" + dependencies: + "sprintf-js" "~1.0.2" + +"arr-diff@^4.0.0": + "integrity" "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=" + "resolved" "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz" + "version" "4.0.0" + +"arr-flatten@^1.1.0": + "integrity" "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==" + "resolved" "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz" + "version" "1.1.0" + +"arr-union@^3.1.0": + "integrity" "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=" + "resolved" "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz" + "version" "3.1.0" + +"array-filter@^1.0.0": + "integrity" "sha1-uveeYubvTCpMC4MSMtr/7CUfnYM=" + "resolved" "https://registry.npmjs.org/array-filter/-/array-filter-1.0.0.tgz" + "version" "1.0.0" + +"array-find-index@^1.0.1": + "integrity" "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=" + "resolved" "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz" + "version" "1.0.2" + +"array-flatten@1.1.1": + "integrity" "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" + "resolved" "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz" + "version" "1.1.1" + +"array-unique@^0.3.2": + "integrity" "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" + "resolved" "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz" + "version" "0.3.2" + +"arraybuffer.slice@~0.0.7": + "integrity" "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==" + "resolved" "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz" + "version" "0.0.7" + +"asap@~2.0.3": + "integrity" "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=" + "resolved" "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz" + "version" "2.0.6" + +"asn1@~0.2.0", "asn1@~0.2.3": + "integrity" "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==" + "resolved" "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz" + "version" "0.2.4" + dependencies: + "safer-buffer" "~2.1.0" + +"assert-plus@^1.0.0", "assert-plus@1.0.0": + "integrity" "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + "resolved" "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz" + "version" "1.0.0" + +"assign-symbols@^1.0.0": + "integrity" "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=" + "resolved" "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz" + "version" "1.0.0" + +"async-array-reduce@^0.2.1": + "integrity" "sha1-yL4BCitc0A3qlsgRFgNGk9/dgtE=" + "resolved" "https://registry.npmjs.org/async-array-reduce/-/async-array-reduce-0.2.1.tgz" + "version" "0.2.1" + +"async-foreach@^0.1.3": + "integrity" "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=" + "resolved" "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz" + "version" "0.1.3" + +"async@^2.6.1": + "integrity" "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==" + "resolved" "https://registry.npmjs.org/async/-/async-2.6.3.tgz" + "version" "2.6.3" + dependencies: + "lodash" "^4.17.14" + +"async@^3.1.0", "async@^3.2.0": + "integrity" "sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==" + "resolved" "https://registry.npmjs.org/async/-/async-3.2.0.tgz" + "version" "3.2.0" + +"asynckit@^0.4.0": + "integrity" "sha1-x57Zf380y48robyXkLzDZkdLS3k=" + "resolved" "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz" + "version" "0.4.0" + +"atob@^2.1.1": + "integrity" "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==" + "resolved" "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz" + "version" "2.1.2" + +"autoprefixer@^9.8.6": + "integrity" "sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==" + "resolved" "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.6.tgz" + "version" "9.8.6" + dependencies: + "browserslist" "^4.12.0" + "caniuse-lite" "^1.0.30001109" + "colorette" "^1.2.1" + "normalize-range" "^0.1.2" + "num2fraction" "^1.2.2" + "postcss" "^7.0.32" + "postcss-value-parser" "^4.1.0" + +"available-typed-arrays@^1.0.0", "available-typed-arrays@^1.0.2": + "integrity" "sha512-XWX3OX8Onv97LMk/ftVyBibpGwY5a8SmuxZPzeOxqmuEqUCOM9ZE+uIaD1VNJ5QnvU2UQusvmKbuM1FR8QWGfQ==" + "resolved" "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.2.tgz" + "version" "1.0.2" + dependencies: + "array-filter" "^1.0.0" + +"awesomplete@^1.1.5": + "integrity" "sha512-UFw1mPW8NaSECDSTC36HbAOTpF9JK2wBUJcNn4MSvlNtK7SZ9N72gB+ajHtA6D1abYXRcszZnBA4nHBwvFwzHw==" + "resolved" "https://registry.npmjs.org/awesomplete/-/awesomplete-1.1.5.tgz" + "version" "1.1.5" + +"aws-sign2@~0.7.0": + "integrity" "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" + "resolved" "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz" + "version" "0.7.0" + +"aws4@^1.8.0": + "integrity" "sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==" + "resolved" "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz" + "version" "1.10.1" + +"axios@^0.21.1": + "integrity" "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==" + "resolved" "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz" + "version" "0.21.1" + dependencies: + "follow-redirects" "^1.10.0" + +"babel-runtime@^6.26.0": + "integrity" "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=" + "resolved" "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz" + "version" "6.26.0" + dependencies: + "core-js" "^2.4.0" + "regenerator-runtime" "^0.11.0" + +"backo2@1.0.2": + "integrity" "sha1-MasayLEpNjRj41s+u2n038+6eUc=" + "resolved" "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz" + "version" "1.0.2" + +"balanced-match@^1.0.0": + "integrity" "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" + "resolved" "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz" + "version" "1.0.0" + +"base@^0.11.1": + "integrity" "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==" + "resolved" "https://registry.npmjs.org/base/-/base-0.11.2.tgz" + "version" "0.11.2" + dependencies: + "cache-base" "^1.0.1" + "class-utils" "^0.3.5" + "component-emitter" "^1.2.1" + "define-property" "^1.0.0" + "isobject" "^3.0.1" + "mixin-deep" "^1.2.0" + "pascalcase" "^0.1.1" + +"base64-arraybuffer@0.1.5": + "integrity" "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=" + "resolved" "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz" + "version" "0.1.5" + +"base64-js@^1.0.2": + "integrity" "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==" + "resolved" "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz" + "version" "1.3.1" + +"base64id@2.0.0": + "integrity" "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==" + "resolved" "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz" + "version" "2.0.0" + +"bcrypt-pbkdf@^1.0.0", "bcrypt-pbkdf@^1.0.2": + "integrity" "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=" + "resolved" "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz" + "version" "1.0.2" + dependencies: + "tweetnacl" "^0.14.3" + +"big.js@^3.1.3": + "integrity" "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==" + "resolved" "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz" + "version" "3.2.0" + +"bl@^3.0.0": + "integrity" "sha512-jrCW5ZhfQ/Vt07WX1Ngs+yn9BDqPL/gw28S7s9H6QK/gupnizNzJAss5akW20ISgOrbLTlXOOCTJeNUQqruAWQ==" + "resolved" "https://registry.npmjs.org/bl/-/bl-3.0.1.tgz" + "version" "3.0.1" + dependencies: + "readable-stream" "^3.0.1" + +"bl@^4.0.1": + "integrity" "sha512-j4OH8f6Qg2bGuWfRiltT2HYGx0e1QcBTrK9KAHNMwMZdQnDZFk0ZSYIpADjYCB3U12nicC5tVJwSIhwOWjb4RQ==" + "resolved" "https://registry.npmjs.org/bl/-/bl-4.0.2.tgz" + "version" "4.0.2" + dependencies: + "buffer" "^5.5.0" + "inherits" "^2.0.4" + "readable-stream" "^3.4.0" + +"bl@^4.0.3": + "integrity" "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==" + "resolved" "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz" + "version" "4.1.0" + dependencies: + "buffer" "^5.5.0" + "inherits" "^2.0.4" + "readable-stream" "^3.4.0" + +"blob@0.0.5": + "integrity" "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==" + "resolved" "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz" + "version" "0.0.5" + +"block-stream@*": + "integrity" "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=" + "resolved" "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz" + "version" "0.0.9" + dependencies: + "inherits" "~2.0.0" + +"bluebird@^3.1.1": + "integrity" "sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==" + "resolved" "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz" + "version" "3.5.3" + +"body-parser@1.19.0": + "integrity" "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==" + "resolved" "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz" + "version" "1.19.0" + dependencies: + "bytes" "3.1.0" + "content-type" "~1.0.4" + "debug" "2.6.9" + "depd" "~1.1.2" + "http-errors" "1.7.2" + "iconv-lite" "0.4.24" + "on-finished" "~2.3.0" + "qs" "6.7.0" + "raw-body" "2.4.0" + "type-is" "~1.6.17" + +"boolbase@^1.0.0", "boolbase@~1.0.0": + "integrity" "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" + "resolved" "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz" + "version" "1.0.0" + +"boolean@^3.0.1": + "integrity" "sha512-EqrTKXQX6Z3A2nRmMEIlAIfjQOgFnVO2nqZGpbcsPnYGWBwpFqzlrozU1dy+S2iqfYDLh26ef4KrgTxu9xQrxA==" + "resolved" "https://registry.npmjs.org/boolean/-/boolean-3.0.3.tgz" + "version" "3.0.3" + +"bootstrap@4": + "integrity" "sha512-Z93QoXvodoVslA+PWNdk23Hze4RBYIkpb5h8I2HY2Tu2h7A0LpAgLcyrhrSUyo2/Oxm2l1fRZPs1e5hnxnliXA==" + "resolved" "https://registry.npmjs.org/bootstrap/-/bootstrap-4.5.0.tgz" + "version" "4.5.0" + +"boxen@^4.2.0": + "integrity" "sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ==" + "resolved" "https://registry.npmjs.org/boxen/-/boxen-4.2.0.tgz" + "version" "4.2.0" + dependencies: + "ansi-align" "^3.0.0" + "camelcase" "^5.3.1" + "chalk" "^3.0.0" + "cli-boxes" "^2.2.0" + "string-width" "^4.1.0" + "term-size" "^2.1.0" + "type-fest" "^0.8.1" + "widest-line" "^3.1.0" + +"brace-expansion@^1.1.7": + "integrity" "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==" + "resolved" "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz" + "version" "1.1.11" + dependencies: + "balanced-match" "^1.0.0" + "concat-map" "0.0.1" + +"braces@^2.3.1": + "integrity" "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==" + "resolved" "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz" + "version" "2.3.2" + dependencies: + "arr-flatten" "^1.1.0" + "array-unique" "^0.3.2" + "extend-shallow" "^2.0.1" + "fill-range" "^4.0.0" + "isobject" "^3.0.1" + "repeat-element" "^1.1.2" + "snapdragon" "^0.8.1" + "snapdragon-node" "^2.0.1" + "split-string" "^3.0.2" + "to-regex" "^3.0.1" + +"braces@^3.0.1": + "integrity" "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==" + "resolved" "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz" + "version" "3.0.2" + dependencies: + "fill-range" "^7.0.1" + +"browser-stdout@1.3.1": + "integrity" "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==" + "resolved" "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz" + "version" "1.3.1" + +"browserify-zlib@^0.1.4": + "integrity" "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=" + "resolved" "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz" + "version" "0.1.4" + dependencies: + "pako" "~0.2.0" + +"browserslist@^4.0.0": + "integrity" "sha512-ISS/AIAiHERJ3d45Fz0AVYKkgcy+F/eJHzKEvv1j0wwKGKD9T3BrwKr/5g45L+Y4XIK5PlTqefHciRFcfE1Jxg==" + "resolved" "https://registry.npmjs.org/browserslist/-/browserslist-4.4.2.tgz" + "version" "4.4.2" + dependencies: + "caniuse-lite" "^1.0.30000939" + "electron-to-chromium" "^1.3.113" + "node-releases" "^1.1.8" + +"browserslist@^4.12.0": + "integrity" "sha512-pUsXKAF2lVwhmtpeA3LJrZ76jXuusrNyhduuQs7CDFf9foT4Y38aQOserd2lMe5DSSrjf3fx34oHwryuvxAUgQ==" + "resolved" "https://registry.npmjs.org/browserslist/-/browserslist-4.14.0.tgz" + "version" "4.14.0" + dependencies: + "caniuse-lite" "^1.0.30001111" + "electron-to-chromium" "^1.3.523" + "escalade" "^3.0.2" + "node-releases" "^1.1.60" + +"buble@^0.19.6": + "integrity" "sha512-9kViM6nJA1Q548Jrd06x0geh+BG2ru2+RMDkIHHgJY/8AcyCs34lTHwra9BX7YdPrZXd5aarkpr/SY8bmPgPdg==" + "resolved" "https://registry.npmjs.org/buble/-/buble-0.19.6.tgz" + "version" "0.19.6" + dependencies: + "chalk" "^2.4.1" + "magic-string" "^0.25.1" + "minimist" "^1.2.0" + "os-homedir" "^1.0.1" + "regexpu-core" "^4.2.0" + "vlq" "^1.0.0" + +"buffer-crc32@~0.2.3": + "integrity" "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=" + "resolved" "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz" + "version" "0.2.13" + +"buffer-from@^1.0.0": + "integrity" "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==" + "resolved" "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz" + "version" "1.1.1" + +"buffer@^5.5.0": + "integrity" "sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==" + "resolved" "https://registry.npmjs.org/buffer/-/buffer-5.6.0.tgz" + "version" "5.6.0" + dependencies: + "base64-js" "^1.0.2" + "ieee754" "^1.1.4" + +"builtin-modules@^3.0.0": + "integrity" "sha512-hMIeU4K2ilbXV6Uv93ZZ0Avg/M91RaKXucQ+4me2Do1txxBDyDZWCBa5bJSLqoNTRpXTLwEzIk1KmloenDDjhg==" + "resolved" "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.0.0.tgz" + "version" "3.0.0" + +"bytes@3.1.0": + "integrity" "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==" + "resolved" "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz" + "version" "3.1.0" + +"cache-base@^1.0.1": + "integrity" "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==" + "resolved" "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz" + "version" "1.0.1" + dependencies: + "collection-visit" "^1.0.0" + "component-emitter" "^1.2.1" + "get-value" "^2.0.6" + "has-value" "^1.0.0" + "isobject" "^3.0.1" + "set-value" "^2.0.0" + "to-object-path" "^0.3.0" + "union-value" "^1.0.0" + "unset-value" "^1.0.0" + +"cacheable-lookup@^5.0.3": + "integrity" "sha512-W+JBqF9SWe18A72XFzN/V/CULFzPm7sBXzzR6ekkE+3tLG72wFZrBiBZhrZuDoYexop4PHJVdFAKb/Nj9+tm9w==" + "resolved" "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.3.tgz" + "version" "5.0.3" + +"cacheable-request@^6.0.0": + "integrity" "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==" + "resolved" "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz" + "version" "6.1.0" + dependencies: + "clone-response" "^1.0.2" + "get-stream" "^5.1.0" + "http-cache-semantics" "^4.0.0" + "keyv" "^3.0.0" + "lowercase-keys" "^2.0.0" + "normalize-url" "^4.1.0" + "responselike" "^1.0.2" + +"cacheable-request@^7.0.1": + "integrity" "sha512-lt0mJ6YAnsrBErpTMWeu5kl/tg9xMAWjavYTN6VQXM1A/teBITuNcccXsCxF0tDQQJf9DfAaX5O4e0zp0KlfZw==" + "resolved" "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.1.tgz" + "version" "7.0.1" + dependencies: + "clone-response" "^1.0.2" + "get-stream" "^5.1.0" + "http-cache-semantics" "^4.0.0" + "keyv" "^4.0.0" + "lowercase-keys" "^2.0.0" + "normalize-url" "^4.1.0" + "responselike" "^2.0.0" + +"caller-callsite@^2.0.0": + "integrity" "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=" + "resolved" "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz" + "version" "2.0.0" + dependencies: + "callsites" "^2.0.0" + +"caller-path@^2.0.0": + "integrity" "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=" + "resolved" "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz" + "version" "2.0.0" + dependencies: + "caller-callsite" "^2.0.0" + +"callsites@^2.0.0": + "integrity" "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=" + "resolved" "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz" + "version" "2.0.0" + +"camelcase-keys@^2.0.0": + "integrity" "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=" + "resolved" "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz" + "version" "2.1.0" + dependencies: + "camelcase" "^2.0.0" + "map-obj" "^1.0.0" + +"camelcase@^2.0.0": + "integrity" "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=" + "resolved" "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz" + "version" "2.1.1" + +"camelcase@^5.0.0", "camelcase@^5.3.1": + "integrity" "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" + "resolved" "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz" + "version" "5.3.1" + +"caniuse-api@^3.0.0": + "integrity" "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==" + "resolved" "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz" + "version" "3.0.0" + dependencies: + "browserslist" "^4.0.0" + "caniuse-lite" "^1.0.0" + "lodash.memoize" "^4.1.2" + "lodash.uniq" "^4.5.0" + +"caniuse-lite@^1.0.0", "caniuse-lite@^1.0.30000939", "caniuse-lite@^1.0.30001109", "caniuse-lite@^1.0.30001111": + "integrity" "sha512-xJJqzyd+7GCJXkcoBiQ1GuxEiOBCLQ0aVW9HMekifZsAVGdj5eJ4mFB9fEhSHipq9IOk/QXFJUiIr9lZT+EsGw==" + "resolved" "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001191.tgz" + "version" "1.0.30001191" + +"caseless@~0.12.0": + "integrity" "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" + "resolved" "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz" + "version" "0.12.0" + +"chalk@^1.1.1": + "integrity" "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=" + "resolved" "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz" + "version" "1.1.3" + dependencies: + "ansi-styles" "^2.2.1" + "escape-string-regexp" "^1.0.2" + "has-ansi" "^2.0.0" + "strip-ansi" "^3.0.0" + "supports-color" "^2.0.0" + +"chalk@^1.1.3": + "integrity" "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=" + "resolved" "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz" + "version" "1.1.3" + dependencies: + "ansi-styles" "^2.2.1" + "escape-string-regexp" "^1.0.2" + "has-ansi" "^2.0.0" + "strip-ansi" "^3.0.0" + "supports-color" "^2.0.0" + +"chalk@^2.0.0", "chalk@^2.3.2", "chalk@^2.4.1", "chalk@^2.4.2": + "integrity" "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==" + "resolved" "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz" + "version" "2.4.2" + dependencies: + "ansi-styles" "^3.2.1" + "escape-string-regexp" "^1.0.5" + "supports-color" "^5.3.0" + +"chalk@^3.0.0": + "integrity" "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==" + "resolved" "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz" + "version" "3.0.0" + dependencies: + "ansi-styles" "^4.1.0" + "supports-color" "^7.1.0" + +"chalk@^4.1.0": + "integrity" "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==" + "resolved" "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz" + "version" "4.1.0" + dependencies: + "ansi-styles" "^4.1.0" + "supports-color" "^7.1.0" + +"chalk@4.1.0": + "integrity" "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==" + "resolved" "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz" + "version" "4.1.0" + dependencies: + "ansi-styles" "^4.1.0" + "supports-color" "^7.1.0" + +"chardet@^0.7.0": + "integrity" "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==" + "resolved" "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz" + "version" "0.7.0" + +"child-process@^1.0.2": + "integrity" "sha1-mJdNx+0e5MYin44wX6cxOmiFp/I=" + "resolved" "https://registry.npmjs.org/child-process/-/child-process-1.0.2.tgz" + "version" "1.0.2" + +"chownr@^2.0.0": + "integrity" "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==" + "resolved" "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz" + "version" "2.0.0" + +"ci-info@^2.0.0": + "integrity" "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==" + "resolved" "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz" + "version" "2.0.0" + +"class-utils@^0.3.5": + "integrity" "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==" + "resolved" "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz" + "version" "0.3.6" + dependencies: + "arr-union" "^3.1.0" + "define-property" "^0.2.5" + "isobject" "^3.0.0" + "static-extend" "^0.1.1" + +"clean-css@^4.1.11": + "integrity" "sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==" + "resolved" "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz" + "version" "4.2.1" + dependencies: + "source-map" "~0.6.0" + +"clean-stack@^2.0.0": + "integrity" "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==" + "resolved" "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz" + "version" "2.2.0" + +"cli-boxes@^2.2.0": + "integrity" "sha512-gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w==" + "resolved" "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.0.tgz" + "version" "2.2.0" + +"cli-cursor@^3.1.0": + "integrity" "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==" + "resolved" "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz" + "version" "3.1.0" + dependencies: + "restore-cursor" "^3.1.0" + +"cli-spinner@0.2.10": + "integrity" "sha512-U0sSQ+JJvSLi1pAYuJykwiA8Dsr15uHEy85iCJ6A+0DjVxivr3d+N2Wjvodeg89uP5K6TswFkKBfAD7B3YSn/Q==" + "resolved" "https://registry.npmjs.org/cli-spinner/-/cli-spinner-0.2.10.tgz" + "version" "0.2.10" + +"cli-spinners@^2.5.0": + "integrity" "sha512-t+4/y50K/+4xcCRosKkA7W4gTr1MySvLV0q+PxmG7FJ5g+66ChKurYjxBCjHggHH3HA5Hh9cy+lcUGWDqVH+4Q==" + "resolved" "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.0.tgz" + "version" "2.6.0" + +"cli-width@^3.0.0": + "integrity" "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==" + "resolved" "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz" + "version" "3.0.0" + +"cliui@^4.0.0": + "integrity" "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==" + "resolved" "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz" + "version" "4.1.0" + dependencies: + "string-width" "^2.1.1" + "strip-ansi" "^4.0.0" + "wrap-ansi" "^2.0.0" + +"cliui@^5.0.0": + "integrity" "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==" + "resolved" "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz" + "version" "5.0.0" + dependencies: + "string-width" "^3.1.0" + "strip-ansi" "^5.2.0" + "wrap-ansi" "^5.1.0" + +"clone-buffer@^1.0.0": + "integrity" "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=" + "resolved" "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz" + "version" "1.0.0" + +"clone-response@^1.0.2": + "integrity" "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=" + "resolved" "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz" + "version" "1.0.2" + dependencies: + "mimic-response" "^1.0.0" + +"clone-stats@^1.0.0": + "integrity" "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=" + "resolved" "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz" + "version" "1.0.0" + +"clone@^1.0.2": + "integrity" "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=" + "resolved" "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz" + "version" "1.0.4" + +"clone@^2.1.1", "clone@^2.1.2": + "integrity" "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=" + "resolved" "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz" + "version" "2.1.2" + +"cloneable-readable@^1.0.0": + "integrity" "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==" + "resolved" "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz" + "version" "1.1.3" + dependencies: + "inherits" "^2.0.1" + "process-nextick-args" "^2.0.0" + "readable-stream" "^2.3.5" + +"coa@^2.0.2": + "integrity" "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==" + "resolved" "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz" + "version" "2.0.2" dependencies: "@types/q" "^1.5.1" - chalk "^2.4.1" - q "^1.1.2" - -code-point-at@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" - integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= - -collection-visit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" - integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA= - dependencies: - map-visit "^1.0.0" - object-visit "^1.0.0" - -color-convert@^1.9.0, color-convert@^1.9.1: - version "1.9.3" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" - integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== - dependencies: - color-name "1.1.3" - -color-convert@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" - integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== - dependencies: - color-name "~1.1.4" - -color-name@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= - -color-name@^1.0.0, color-name@~1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" - integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== - -color-string@^1.5.2: - version "1.5.3" - resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.3.tgz#c9bbc5f01b58b5492f3d6857459cb6590ce204cc" - integrity sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw== - dependencies: - color-name "^1.0.0" - simple-swizzle "^0.2.2" - -color@3.0.x: - version "3.0.0" - resolved "https://registry.yarnpkg.com/color/-/color-3.0.0.tgz#d920b4328d534a3ac8295d68f7bd4ba6c427be9a" - integrity sha512-jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w== - dependencies: - color-convert "^1.9.1" - color-string "^1.5.2" - -color@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/color/-/color-3.1.0.tgz#d8e9fb096732875774c84bf922815df0308d0ffc" - integrity sha512-CwyopLkuRYO5ei2EpzpIh6LqJMt6Mt+jZhO5VI5f/wJLZriXQE32/SSqzmrh+QB+AZT81Cj8yv+7zwToW8ahZg== - dependencies: - color-convert "^1.9.1" - color-string "^1.5.2" - -colorette@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b" - integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw== - -colors@^1.2.1: - version "1.4.0" - resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" - integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== - -colorspace@1.1.x: - version "1.1.2" - resolved "https://registry.yarnpkg.com/colorspace/-/colorspace-1.1.2.tgz#e0128950d082b86a2168580796a0aa5d6c68d8c5" - integrity sha512-vt+OoIP2d76xLhjwbBaucYlNSpPsrJWPlBTtwCpQKIu6/CSMutyzX93O/Do0qzpH3YoHEes8YEFXyZ797rEhzQ== - dependencies: - color "3.0.x" - text-hex "1.0.x" - -combined-stream@^1.0.6, combined-stream@~1.0.6: - version "1.0.8" - resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" - integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== - dependencies: - delayed-stream "~1.0.0" - -commander@2.15.1: - version "2.15.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f" - integrity sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag== - -commander@^2.19.0: - version "2.20.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422" - integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ== - -component-bind@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1" - integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E= - -component-emitter@1.2.1, component-emitter@^1.2.0, component-emitter@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" - integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY= - -component-emitter@~1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" - integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== - -component-inherit@0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143" - integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM= - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= - -concat-stream@^1.6.2: - version "1.6.2" - resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" - integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== - dependencies: - buffer-from "^1.0.0" - inherits "^2.0.3" - readable-stream "^2.2.2" - typedarray "^0.0.6" - -concat-with-sourcemaps@^1.0.5: - version "1.1.0" - resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz#d4ea93f05ae25790951b99e7b3b09e3908a4082e" - integrity sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg== - dependencies: - source-map "^0.6.1" - -configstore@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96" - integrity sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA== - dependencies: - dot-prop "^5.2.0" - graceful-fs "^4.1.2" - make-dir "^3.0.0" - unique-string "^2.0.0" - write-file-atomic "^3.0.0" - xdg-basedir "^4.0.0" - -console-control-strings@^1.0.0, console-control-strings@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" - integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= - -consolidate@^0.15.1: - version "0.15.1" - resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.15.1.tgz#21ab043235c71a07d45d9aad98593b0dba56bab7" - integrity sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw== - dependencies: - bluebird "^3.1.1" - -content-disposition@0.5.3: - version "0.5.3" - resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" - integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g== - dependencies: - safe-buffer "5.1.2" - -content-type@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" - integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== - -cookie-signature@1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" - integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= - -cookie@0.4.0, cookie@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" - integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== - -cookie@~0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1" - integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA== - -cookiejar@^2.1.0: - version "2.1.2" - resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.2.tgz#dd8a235530752f988f9a0844f3fc589e3111125c" - integrity sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA== - -copy-descriptor@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" - integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= - -core-js@^2.4.0: - version "2.6.11" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c" - integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg== - -core-js@^3.6.5: - version "3.6.5" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a" - integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA== - -core-util-is@1.0.2, core-util-is@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= - -cosmiconfig@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-4.0.0.tgz#760391549580bbd2df1e562bc177b13c290972dc" - integrity sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ== - dependencies: - is-directory "^0.3.1" - js-yaml "^3.9.0" - parse-json "^4.0.0" - require-from-string "^2.0.1" - -cosmiconfig@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.1.0.tgz#6c5c35e97f37f985061cdf653f114784231185cf" - integrity sha512-kCNPvthka8gvLtzAxQXvWo4FxqRB+ftRZyPZNuab5ngvM9Y7yw7hbEysglptLgpkGX9nAOKTBVkHUAe8xtYR6Q== - dependencies: - import-fresh "^2.0.0" - is-directory "^0.3.1" - js-yaml "^3.9.0" - lodash.get "^4.4.2" - parse-json "^4.0.0" - -cross-spawn@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982" - integrity sha1-ElYDfsufDF9549bvE14wdwGEuYI= - dependencies: - lru-cache "^4.0.1" - which "^1.2.9" - -cross-spawn@^6.0.0: - version "6.0.5" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" - integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== - dependencies: - nice-try "^1.0.4" - path-key "^2.0.1" - semver "^5.5.0" - shebang-command "^1.2.0" - which "^1.2.9" - -crypto-random-string@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" - integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== - -css-color-names@0.0.4, css-color-names@^0.0.4: - version "0.0.4" - resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0" - integrity sha1-gIrcLnnPhHOAabZGyyDsJ762KeA= - -css-declaration-sorter@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz#c198940f63a76d7e36c1e71018b001721054cb22" - integrity sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA== - dependencies: - postcss "^7.0.1" - timsort "^0.3.0" - -css-modules-loader-core@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/css-modules-loader-core/-/css-modules-loader-core-1.1.0.tgz#5908668294a1becd261ae0a4ce21b0b551f21d16" - integrity sha1-WQhmgpShvs0mGuCkziGwtVHyHRY= - dependencies: - icss-replace-symbols "1.1.0" - postcss "6.0.1" - postcss-modules-extract-imports "1.1.0" - postcss-modules-local-by-default "1.2.0" - postcss-modules-scope "1.1.0" - postcss-modules-values "1.3.0" - -css-select-base-adapter@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz#3b2ff4972cc362ab88561507a95408a1432135d7" - integrity sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w== - -css-select@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/css-select/-/css-select-2.0.2.tgz#ab4386cec9e1f668855564b17c3733b43b2a5ede" - integrity sha512-dSpYaDVoWaELjvZ3mS6IKZM/y2PMPa/XYoEfYNZePL4U/XgyxZNroHEHReDx/d+VgXh9VbCTtFqLkFbmeqeaRQ== - dependencies: - boolbase "^1.0.0" - css-what "^2.1.2" - domutils "^1.7.0" - nth-check "^1.0.2" - -css-selector-parser@^1.3.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/css-selector-parser/-/css-selector-parser-1.4.1.tgz#03f9cb8a81c3e5ab2c51684557d5aaf6d2569759" - integrity sha512-HYPSb7y/Z7BNDCOrakL4raGO2zltZkbeXyAd6Tg9obzix6QhzxCotdBl6VT0Dv4vZfJGVz3WL/xaEI9Ly3ul0g== - -css-selector-tokenizer@^0.7.0: - version "0.7.1" - resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz#a177271a8bca5019172f4f891fc6eed9cbf68d5d" - integrity sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA== - dependencies: - cssesc "^0.1.0" - fastparse "^1.1.1" - regexpu-core "^1.0.0" - -css-tree@1.0.0-alpha.28: - version "1.0.0-alpha.28" - resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.28.tgz#8e8968190d886c9477bc8d61e96f61af3f7ffa7f" - integrity sha512-joNNW1gCp3qFFzj4St6zk+Wh/NBv0vM5YbEreZk0SD4S23S+1xBKb6cLDg2uj4P4k/GUMlIm6cKIDqIG+vdt0w== - dependencies: - mdn-data "~1.1.0" - source-map "^0.5.3" - -css-tree@1.0.0-alpha.29: - version "1.0.0-alpha.29" - resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.29.tgz#3fa9d4ef3142cbd1c301e7664c1f352bd82f5a39" - integrity sha512-sRNb1XydwkW9IOci6iB2xmy8IGCj6r/fr+JWitvJ2JxQRPzN3T4AGGVWCMlVmVwM1gtgALJRmGIlWv5ppnGGkg== - dependencies: - mdn-data "~1.1.0" - source-map "^0.5.3" - -css-tree@1.0.0-alpha.37: - version "1.0.0-alpha.37" - resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz#98bebd62c4c1d9f960ec340cf9f7522e30709a22" - integrity sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg== - dependencies: - mdn-data "2.0.4" - source-map "^0.6.1" - -css-tree@1.0.0-alpha.39: - version "1.0.0-alpha.39" - resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.39.tgz#2bff3ffe1bb3f776cf7eefd91ee5cba77a149eeb" - integrity sha512-7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA== - dependencies: - mdn-data "2.0.6" - source-map "^0.6.1" - -css-unit-converter@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/css-unit-converter/-/css-unit-converter-1.1.1.tgz#d9b9281adcfd8ced935bdbaba83786897f64e996" - integrity sha1-2bkoGtz9jO2TW9urqDeGiX9k6ZY= - -css-url-regex@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/css-url-regex/-/css-url-regex-1.1.0.tgz#83834230cc9f74c457de59eebd1543feeb83b7ec" - integrity sha1-g4NCMMyfdMRX3lnuvRVD/uuDt+w= - -css-what@^2.1.2: - version "2.1.3" - resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2" - integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg== - -cssesc@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4" - integrity sha1-yBSQPkViM3GgR3tAEJqq++6t27Q= - -cssesc@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-2.0.0.tgz#3b13bd1bb1cb36e1bcb5a4dcd27f54c5dcb35703" - integrity sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg== - -cssmin@^0.4.3: - version "0.4.3" - resolved "https://registry.yarnpkg.com/cssmin/-/cssmin-0.4.3.tgz#c9194077e0ebdacd691d5f59015b9d819f38d015" - integrity sha1-yRlAd+Dr2s1pHV9ZAVudgZ840BU= - -cssnano-preset-default@^4.0.7: - version "4.0.7" - resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz#51ec662ccfca0f88b396dcd9679cdb931be17f76" - integrity sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA== - dependencies: - css-declaration-sorter "^4.0.1" - cssnano-util-raw-cache "^4.0.1" - postcss "^7.0.0" - postcss-calc "^7.0.1" - postcss-colormin "^4.0.3" - postcss-convert-values "^4.0.1" - postcss-discard-comments "^4.0.2" - postcss-discard-duplicates "^4.0.2" - postcss-discard-empty "^4.0.1" - postcss-discard-overridden "^4.0.1" - postcss-merge-longhand "^4.0.11" - postcss-merge-rules "^4.0.3" - postcss-minify-font-values "^4.0.2" - postcss-minify-gradients "^4.0.2" - postcss-minify-params "^4.0.2" - postcss-minify-selectors "^4.0.2" - postcss-normalize-charset "^4.0.1" - postcss-normalize-display-values "^4.0.2" - postcss-normalize-positions "^4.0.2" - postcss-normalize-repeat-style "^4.0.2" - postcss-normalize-string "^4.0.2" - postcss-normalize-timing-functions "^4.0.2" - postcss-normalize-unicode "^4.0.1" - postcss-normalize-url "^4.0.1" - postcss-normalize-whitespace "^4.0.2" - postcss-ordered-values "^4.1.2" - postcss-reduce-initial "^4.0.3" - postcss-reduce-transforms "^4.0.2" - postcss-svgo "^4.0.2" - postcss-unique-selectors "^4.0.1" - -cssnano-util-get-arguments@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz#ed3a08299f21d75741b20f3b81f194ed49cc150f" - integrity sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8= - -cssnano-util-get-match@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz#c0e4ca07f5386bb17ec5e52250b4f5961365156d" - integrity sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0= - -cssnano-util-raw-cache@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz#b26d5fd5f72a11dfe7a7846fb4c67260f96bf282" - integrity sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA== - dependencies: - postcss "^7.0.0" - -cssnano-util-same-parent@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz#574082fb2859d2db433855835d9a8456ea18bbf3" - integrity sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q== - -cssnano@^4.1.10, cssnano@^4.1.8: - version "4.1.10" - resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-4.1.10.tgz#0ac41f0b13d13d465487e111b778d42da631b8b2" - integrity sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ== - dependencies: - cosmiconfig "^5.0.0" - cssnano-preset-default "^4.0.7" - is-resolvable "^1.0.0" - postcss "^7.0.0" - -csso@^3.5.1: - version "3.5.1" - resolved "https://registry.yarnpkg.com/csso/-/csso-3.5.1.tgz#7b9eb8be61628973c1b261e169d2f024008e758b" - integrity sha512-vrqULLffYU1Q2tLdJvaCYbONStnfkfimRxXNaGjxMldI0C7JPBC4rB1RyjhfdZ4m1frm8pM9uRPKH3d2knZ8gg== - dependencies: - css-tree "1.0.0-alpha.29" - -csso@^4.0.2: - version "4.0.3" - resolved "https://registry.yarnpkg.com/csso/-/csso-4.0.3.tgz#0d9985dc852c7cc2b2cacfbbe1079014d1a8e903" - integrity sha512-NL3spysxUkcrOgnpsT4Xdl2aiEiBG6bXswAABQVHcMrfjjBisFOKwLDOmf4wf32aPdcJws1zds2B0Rg+jqMyHQ== - dependencies: - css-tree "1.0.0-alpha.39" - -cssom@^0.3.4: - version "0.3.8" - resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a" - integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg== - -currently-unhandled@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea" - integrity sha1-mI3zP+qxke95mmE2nddsF635V+o= - dependencies: - array-find-index "^1.0.1" - -custom-event-polyfill@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/custom-event-polyfill/-/custom-event-polyfill-1.0.7.tgz#9bc993ddda937c1a30ccd335614c6c58c4f87aee" - integrity sha512-TDDkd5DkaZxZFM8p+1I3yAlvM3rSr1wbrOliG4yJiwinMZN8z/iGL7BTlDkrJcYTmgUSb4ywVCc3ZaUtOtC76w== - -cwise-compiler@^1.1.2: - version "1.1.3" - resolved "https://registry.yarnpkg.com/cwise-compiler/-/cwise-compiler-1.1.3.tgz#f4d667410e850d3a313a7d2db7b1e505bb034cc5" - integrity sha1-9NZnQQ6FDToxOn0tt7HlBbsDTMU= - dependencies: - uniq "^1.0.0" - -dashdash@^1.12.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" - integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= - dependencies: - assert-plus "^1.0.0" - -data-uri-to-buffer@0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-0.0.3.tgz#18ae979a6a0ca994b0625853916d2662bbae0b1a" - integrity sha1-GK6XmmoMqZSwYlhTkW0mYruuCxo= - -dateformat@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae" - integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q== - -de-indent@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d" - integrity sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0= - -debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9: - version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== - dependencies: - ms "2.0.0" - -debug@3.1.0, debug@~3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" - integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== - dependencies: - ms "2.0.0" - -debug@^3.0.1: - version "3.2.7" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" - integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== - dependencies: - ms "^2.1.1" - -debug@^3.1.0, debug@^3.2.6: - version "3.2.6" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" - integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== - dependencies: - ms "^2.1.1" - -debug@^4.1.1, debug@~4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" - integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== - dependencies: - ms "^2.1.1" - -debug@^4.2.0, debug@^4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" - integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== - dependencies: - ms "2.1.2" - -decamelize@^1.1.2, decamelize@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" - integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= - -decode-uri-component@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" - integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= - -decompress-response@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" - integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M= - dependencies: - mimic-response "^1.0.0" - -decompress-response@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc" - integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ== - dependencies: - mimic-response "^3.1.0" - -deep-equal@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5" - integrity sha1-9dJgKStmDghO/0zbyfCK0yR0SLU= - -deep-equal@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.0.3.tgz#cad1c15277ad78a5c01c49c2dee0f54de8a6a7b0" - integrity sha512-Spqdl4H+ky45I9ByyJtXteOm9CaIrPmnIPmOhrkKGNYWeDgCvJ8jNYVCTjChxW4FqGuZnLHADc8EKRMX6+CgvA== - dependencies: - es-abstract "^1.17.5" - es-get-iterator "^1.1.0" - is-arguments "^1.0.4" - is-date-object "^1.0.2" - is-regex "^1.0.5" - isarray "^2.0.5" - object-is "^1.1.2" - object-keys "^1.1.1" - object.assign "^4.1.0" - regexp.prototype.flags "^1.3.0" - side-channel "^1.0.2" - which-boxed-primitive "^1.0.1" - which-collection "^1.0.1" - which-typed-array "^1.1.2" - -deep-extend@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" - integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== - -defaults@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d" - integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730= - dependencies: - clone "^1.0.2" - -defer-to-connect@^1.0.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591" - integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ== - -defer-to-connect@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.0.tgz#83d6b199db041593ac84d781b5222308ccf4c2c1" - integrity sha512-bYL2d05vOSf1JEZNx5vSAtPuBMkX8K9EUutg7zlKvTqKXHt7RhWJFbmd7qakVuf13i+IkGmp6FwSsONOf6VYIg== - -define-properties@^1.1.2, define-properties@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" - integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== - dependencies: - object-keys "^1.0.12" - -define-property@^0.2.5: - version "0.2.5" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" - integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY= - dependencies: - is-descriptor "^0.1.0" - -define-property@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6" - integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY= - dependencies: - is-descriptor "^1.0.0" - -define-property@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d" - integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ== - dependencies: - is-descriptor "^1.0.2" - isobject "^3.0.1" - -delayed-stream@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" - integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= - -delegates@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" - integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= - -denque@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/denque/-/denque-1.5.0.tgz#773de0686ff2d8ec2ff92914316a47b73b1c73de" - integrity sha512-CYiCSgIF1p6EUByQPlGkKnP1M9g0ZV3qMIrqMqZqdwazygIA/YP2vrbcyl1h/WppKJTdl1F85cXIle+394iDAQ== - -depd@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" - integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= - -destroy@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" - integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= - -detect-node@^2.0.4: - version "2.0.5" - resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.5.tgz#9d270aa7eaa5af0b72c4c9d9b814e7f4ce738b79" - integrity sha512-qi86tE6hRcFHy8jI1m2VG+LaPUR1LhqDa5G8tVjuUXmOrpuAgqsA1pN0+ldgr3aKUH+QLI9hCY/OcRYisERejw== - -diff@3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12" - integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA== - -diff@^4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" - integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== - -docker-modem@2.1.3: - version "2.1.3" - resolved "https://registry.yarnpkg.com/docker-modem/-/docker-modem-2.1.3.tgz#15432225f63db02eb5de4bb9a621b7293e5f264d" - integrity sha512-cwaRptBmYZwu/FyhGcqBm2MzXA77W2/E6eVkpOZVDk6PkI9Bjj84xPrXiHMA+OWjzNy+DFjgKh8Q+1hMR7/OHg== - dependencies: - debug "^4.1.1" - readable-stream "^3.5.0" - split-ca "^1.0.1" - ssh2 "^0.8.7" - -dockerfile-ast@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/dockerfile-ast/-/dockerfile-ast-0.2.0.tgz#13cc4a6fe3aea30a4104622b30f49a0fe3a5c038" - integrity sha512-iQyp12k1A4tF3sEfLAq2wfFPKdpoiGTJeuiu2Y1bdEqIZu0DfSSL2zm0fk7a/UHeQkngnYaRRGuON+C+2LO1Fw== - dependencies: - vscode-languageserver-types "^3.16.0" - -dom-serializer@0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0" - integrity sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA== - dependencies: - domelementtype "^1.3.0" - entities "^1.1.1" - -domelementtype@1, domelementtype@^1.3.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" - integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w== - -domutils@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a" - integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg== - dependencies: - dom-serializer "0" - domelementtype "1" - -dot-prop@^4.1.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.1.tgz#45884194a71fc2cda71cbb4bceb3a4dd2f433ba4" - integrity sha512-l0p4+mIuJIua0mhxGoh4a+iNL9bmeK5DvnSVQa6T0OhrVmaEa1XScX5Etc673FePCJOArq/4Pa2cLGODUWTPOQ== - dependencies: - is-obj "^1.0.0" - -dot-prop@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz#c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb" - integrity sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A== - dependencies: - is-obj "^2.0.0" - -dotnet-deps-parser@5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/dotnet-deps-parser/-/dotnet-deps-parser-5.0.0.tgz#5115c442cbefea59e4fb9f9ed8fa4863a0f3186d" - integrity sha512-1l9K4UnQQHSfKgeHeLrxnB53AidCZqPyf9dkRL4/fZl8//NPiiDD43zHtgylw8DHlO7gvM8+O5a0UPHesNYZKw== - dependencies: - lodash.isempty "^4.4.0" - lodash.set "^4.3.2" - lodash.uniq "^4.5.0" - source-map-support "^0.5.7" - tslib "^1.10.0" - xml2js "0.4.23" - -driver.js@^0.9.8: - version "0.9.8" - resolved "https://registry.yarnpkg.com/driver.js/-/driver.js-0.9.8.tgz#4b327f4537b1c9b9fb19419de86174be821ae32a" - integrity sha512-bczjyKdX6XmFyCDkwtRmlaORDwfBk1xXmRO0CAe5VwNQTM98aWaG2LAIiIdTe53iV/B7W5lXlIy2xYtf0JRb7Q== - -duplexer3@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" - integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI= - -duplexify@^3.5.0, duplexify@^3.6.0: - version "3.7.1" - resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309" - integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g== - dependencies: - end-of-stream "^1.0.0" - inherits "^2.0.1" - readable-stream "^2.0.0" - stream-shift "^1.0.0" - -ecc-jsbn@~0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" - integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk= - dependencies: - jsbn "~0.1.0" - safer-buffer "^2.1.0" - -ee-first@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" - integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= - -electron-to-chromium@^1.3.113: - version "1.3.113" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.113.tgz#b1ccf619df7295aea17bc6951dc689632629e4a9" - integrity sha512-De+lPAxEcpxvqPTyZAXELNpRZXABRxf+uL/rSykstQhzj/B0l1150G/ExIIxKc16lI89Hgz81J0BHAcbTqK49g== - -electron-to-chromium@^1.3.523: - version "1.3.551" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.551.tgz#a94d243a4ca90705189bd4a5eca4e0f56b745a4f" - integrity sha512-11qcm2xvf2kqeFO5EIejaBx5cKXsW1quAyv3VctCMYwofnyVZLs97y6LCekss3/ghQpr7PYkSO3uId5FmxZsdw== - -elfy@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/elfy/-/elfy-1.0.0.tgz#7a1c86af7d41e0a568cbb4a3fa5b685648d9efcd" - integrity sha512-4Kp3AA94jC085IJox+qnvrZ3PudqTi4gQNvIoTZfJJ9IqkRuCoqP60vCVYlIg00c5aYusi5Wjh2bf0cHYt+6gQ== - dependencies: - endian-reader "^0.3.0" - -email-validator@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/email-validator/-/email-validator-2.0.4.tgz#b8dfaa5d0dae28f1b03c95881d904d4e40bfe7ed" - integrity sha512-gYCwo7kh5S3IDyZPLZf6hSS0MnZT8QmJFqYvbqlDZSbwdZlY6QZWxJ4i/6UhITOJ4XzyI647Bm2MXKCLqnJ4nQ== - -emoji-regex@^7.0.1: - version "7.0.3" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" - integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== - -emoji-regex@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" - integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== - -emojis-list@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389" - integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k= - -enabled@2.0.x: - version "2.0.0" - resolved "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz#f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2" - integrity sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ== - -encodeurl@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" - integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= - -end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1: - version "1.4.4" - resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" - integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== - dependencies: - once "^1.4.0" - -endian-reader@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/endian-reader/-/endian-reader-0.3.0.tgz#84eca436b80aed0d0639c47291338b932efe50a0" - integrity sha1-hOykNrgK7Q0GOcRykTOLky7+UKA= - -engine.io-client@~3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.5.0.tgz#fc1b4d9616288ce4f2daf06dcf612413dec941c7" - integrity sha512-12wPRfMrugVw/DNyJk34GQ5vIVArEcVMXWugQGGuw2XxUSztFNmJggZmv8IZlLyEdnpO1QB9LkcjeWewO2vxtA== - dependencies: - component-emitter "~1.3.0" - component-inherit "0.0.3" - debug "~3.1.0" - engine.io-parser "~2.2.0" - has-cors "1.1.0" - indexof "0.0.1" - parseqs "0.0.6" - parseuri "0.0.6" - ws "~7.4.2" - xmlhttprequest-ssl "~1.5.4" - yeast "0.1.2" - -engine.io-parser@~2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.2.0.tgz#312c4894f57d52a02b420868da7b5c1c84af80ed" - integrity sha512-6I3qD9iUxotsC5HEMuuGsKA0cXerGz+4uGcXQEkfBidgKf0amsjrrtwcbwK/nzpZBxclXlV7gGl9dgWvu4LF6w== - dependencies: - after "0.8.2" - arraybuffer.slice "~0.0.7" - base64-arraybuffer "0.1.5" - blob "0.0.5" - has-binary2 "~1.0.2" - -engine.io@~3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.5.0.tgz#9d6b985c8a39b1fe87cd91eb014de0552259821b" - integrity sha512-21HlvPUKaitDGE4GXNtQ7PLP0Sz4aWLddMPw2VTyFz1FVZqu/kZsJUO8WNpKuE/OCL7nkfRaOui2ZCJloGznGA== - dependencies: - accepts "~1.3.4" - base64id "2.0.0" - cookie "~0.4.1" - debug "~4.1.0" - engine.io-parser "~2.2.0" - ws "~7.4.2" - -entities@^1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56" - integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w== - -errno@^0.1.1: - version "0.1.7" - resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618" - integrity sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg== - dependencies: - prr "~1.0.1" - -error-ex@^1.2.0, error-ex@^1.3.1: - version "1.3.2" - resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" - integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== - dependencies: - is-arrayish "^0.2.1" - -es-abstract@^1.12.0, es-abstract@^1.5.1: - version "1.13.0" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9" - integrity sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg== - dependencies: - es-to-primitive "^1.2.0" - function-bind "^1.1.1" - has "^1.0.3" - is-callable "^1.1.4" - is-regex "^1.0.4" - object-keys "^1.0.12" - -es-abstract@^1.17.0-next.1, es-abstract@^1.17.4, es-abstract@^1.17.5: - version "1.17.5" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz#d8c9d1d66c8981fb9200e2251d799eee92774ae9" - integrity sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg== - dependencies: - es-to-primitive "^1.2.1" - function-bind "^1.1.1" - has "^1.0.3" - has-symbols "^1.0.1" - is-callable "^1.1.5" - is-regex "^1.0.5" - object-inspect "^1.7.0" - object-keys "^1.1.1" - object.assign "^4.1.0" - string.prototype.trimleft "^2.1.1" - string.prototype.trimright "^2.1.1" - -es-get-iterator@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.0.tgz#bb98ad9d6d63b31aacdc8f89d5d0ee57bcb5b4c8" - integrity sha512-UfrmHuWQlNMTs35e1ypnvikg6jCz3SK8v8ImvmDsh36fCVUR1MqoFDiyn0/k52C8NqO3YsO8Oe0azeesNuqSsQ== - dependencies: - es-abstract "^1.17.4" - has-symbols "^1.0.1" - is-arguments "^1.0.4" - is-map "^2.0.1" - is-set "^2.0.1" - is-string "^1.0.5" - isarray "^2.0.5" - -es-to-primitive@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377" - integrity sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg== - dependencies: - is-callable "^1.1.4" - is-date-object "^1.0.1" - is-symbol "^1.0.2" - -es-to-primitive@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" - integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== - dependencies: - is-callable "^1.1.4" - is-date-object "^1.0.1" - is-symbol "^1.0.2" - -es6-error@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" - integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg== - -es6-promise@^4.0.3: - version "4.2.8" - resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a" - integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w== - -escalade@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.0.2.tgz#6a580d70edb87880f22b4c91d0d56078df6962c4" - integrity sha512-gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ== - -escape-goat@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675" - integrity sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q== - -escape-html@~1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" - integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= - -escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= - -escape-string-regexp@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" - integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== - -esprima@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" - integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== - -estree-walker@^0.5.0: - version "0.5.2" - resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.5.2.tgz#d3850be7529c9580d815600b53126515e146dd39" - integrity sha512-XpCnW/AE10ws/kDAs37cngSkvgIR8aN3G0MS85m7dUpuK2EREo9VJ00uvw6Dg/hXEpfsE1I1TvJOJr+Z+TL+ig== - -estree-walker@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.0.tgz#5d865327c44a618dde5699f763891ae31f257dae" - integrity sha512-peq1RfVAVzr3PU/jL31RaOjUKLoZJpObQWJJ+LgfcxDUifyLZ1RjPQZTl0pzj2uJ45b7A7XpyppXvxdEqzo4rw== - -esutils@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" - integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs= - -etag@~1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" - integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= - -event-loop-spinner@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/event-loop-spinner/-/event-loop-spinner-2.0.0.tgz#3aa949264a7d80be45d6cb782ab5e97ffc87b9e1" - integrity sha512-1y4j/Mhttr8ordvHkbDsGzGrlQaSYJoXD/3YKUxiOXIk7myEn9UPfybEk/lLtrcU3D4QvCNmVUxVQaPtvAIaUw== - dependencies: - tslib "^1.10.0" - -event-loop-spinner@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/event-loop-spinner/-/event-loop-spinner-2.1.0.tgz#75f501d585105c6d57f174073b39af1b6b3a1567" - integrity sha512-RJ10wL8/F9AlfBgRCvYctJIXSb9XkVmSCK3GGUvPD3dJrvTjDeDT0tmhcbEC6I2NEjNM9xD38HQJ4F/f/gb4VQ== - dependencies: - tslib "^2.1.0" - -eventemitter3@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-2.0.3.tgz#b5e1079b59fb5e1ba2771c0a993be060a58c99ba" - integrity sha1-teEHm1n7XhuidxwKmTvgYKWMmbo= - -eventemitter3@^4.0.0: - version "4.0.4" - resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.4.tgz#b5463ace635a083d018bdc7c917b4c5f10a85384" - integrity sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ== - -execa@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8" - integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA== - dependencies: - cross-spawn "^6.0.0" - get-stream "^4.0.0" - is-stream "^1.1.0" - npm-run-path "^2.0.0" - p-finally "^1.0.0" - signal-exit "^3.0.0" - strip-eof "^1.0.0" - -expand-brackets@^2.1.4: - version "2.1.4" - resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" - integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI= - dependencies: - debug "^2.3.3" - define-property "^0.2.5" - extend-shallow "^2.0.1" - posix-character-classes "^0.1.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -expand-tilde@^2.0.0, expand-tilde@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502" - integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI= - dependencies: - homedir-polyfill "^1.0.1" - -express@^4.17.1: - version "4.17.1" - resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" - integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g== - dependencies: - accepts "~1.3.7" - array-flatten "1.1.1" - body-parser "1.19.0" - content-disposition "0.5.3" - content-type "~1.0.4" - cookie "0.4.0" - cookie-signature "1.0.6" - debug "2.6.9" - depd "~1.1.2" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - finalhandler "~1.1.2" - fresh "0.5.2" - merge-descriptors "1.0.1" - methods "~1.1.2" - on-finished "~2.3.0" - parseurl "~1.3.3" - path-to-regexp "0.1.7" - proxy-addr "~2.0.5" - qs "6.7.0" - range-parser "~1.2.1" - safe-buffer "5.1.2" - send "0.17.1" - serve-static "1.14.1" - setprototypeof "1.1.1" - statuses "~1.5.0" - type-is "~1.6.18" - utils-merge "1.0.1" - vary "~1.1.2" - -extend-shallow@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" - integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= - dependencies: - is-extendable "^0.1.0" - -extend-shallow@^3.0.0, extend-shallow@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" - integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg= - dependencies: - assign-symbols "^1.0.0" - is-extendable "^1.0.1" - -extend@^3.0.0, extend@^3.0.2, extend@~3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" - integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== - -external-editor@^3.0.3: - version "3.1.0" - resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495" - integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew== - dependencies: - chardet "^0.7.0" - iconv-lite "^0.4.24" - tmp "^0.0.33" - -extglob@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" - integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw== - dependencies: - array-unique "^0.3.2" - define-property "^1.0.0" - expand-brackets "^2.1.4" - extend-shallow "^2.0.1" - fragment-cache "^0.2.1" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -extract-zip@^1.6.5: - version "1.7.0" - resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927" - integrity sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA== - dependencies: - concat-stream "^1.6.2" - debug "^2.6.9" - mkdirp "^0.5.4" - yauzl "^2.10.0" - -extsprintf@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" - integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU= - -extsprintf@^1.2.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" - integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= - -fast-deep-equal@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49" - integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk= - -fast-deep-equal@^3.1.1: - version "3.1.3" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" - integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== - -fast-diff@1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.1.2.tgz#4b62c42b8e03de3f848460b639079920695d0154" - integrity sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig== - -fast-diff@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03" - integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w== - -fast-json-stable-stringify@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" - integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== - -fast-safe-stringify@^2.0.4: - version "2.0.7" - resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz#124aa885899261f68aedb42a7c080de9da608743" - integrity sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA== - -fastparse@^1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9" - integrity sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ== - -fastq@^1.6.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.0.tgz#bb9fb955a07130a918eb63c1f5161cc32a5d0858" - integrity sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g== - dependencies: - reusify "^1.0.4" - -fd-slicer@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" - integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4= - dependencies: - pend "~1.2.0" - -fecha@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.0.tgz#3ffb6395453e3f3efff850404f0a59b6747f5f41" - integrity sha512-aN3pcx/DSmtyoovUudctc8+6Hl4T+hI9GBBHLjA76jdZl7+b1sgh5g4k+u/GL3dTy1/pnYzKp69FpJ0OicE3Wg== - -figures@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" - integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg== - dependencies: - escape-string-regexp "^1.0.5" - -fill-range@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" - integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc= - dependencies: - extend-shallow "^2.0.1" - is-number "^3.0.0" - repeat-string "^1.6.1" - to-regex-range "^2.1.0" - -fill-range@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" - integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== - dependencies: - to-regex-range "^5.0.1" - -finalhandler@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" - integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== - dependencies: - debug "2.6.9" - encodeurl "~1.0.2" - escape-html "~1.0.3" - on-finished "~2.3.0" - parseurl "~1.3.3" - statuses "~1.5.0" - unpipe "~1.0.0" - -find-up@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" - integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8= - dependencies: - path-exists "^2.0.0" - pinkie-promise "^2.0.0" - -find-up@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" - integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg== - dependencies: - locate-path "^3.0.0" - -fn.name@1.x.x: - version "1.1.0" - resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc" - integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw== - -follow-redirects@^1.10.0: - version "1.13.3" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.3.tgz#e5598ad50174c1bc4e872301e82ac2cd97f90267" - integrity sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA== - -for-in@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" - integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA= - -foreach@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99" - integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k= - -forever-agent@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" - integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= - -form-data@^2.3.1, form-data@~2.3.2: - version "2.3.3" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" - integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.6" - mime-types "^2.1.12" - -formidable@^1.2.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.2.1.tgz#70fb7ca0290ee6ff961090415f4b3df3d2082659" - integrity sha512-Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg== - -forwarded@~0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" - integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ= - -fragment-cache@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" - integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk= - dependencies: - map-cache "^0.2.2" - -frappe-charts@^2.0.0-rc13: - version "2.0.0-rc13" - resolved "https://registry.yarnpkg.com/frappe-charts/-/frappe-charts-2.0.0-rc13.tgz#fdb251d7ae311c41e38f90a3ae108070ec6b9072" - integrity sha512-Bv7IfllIrjRbKWHn5b769dOSenqdBixAr6m5kurf8ZUOJSLOgK4HOXItJ7BA8n9PvviH9/k5DaloisjLM2Bm1w== - -frappe-datatable@^1.15.3: - version "1.15.3" - resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.15.3.tgz#1737e9aebfd363ffadffced71a3534c40e350223" - integrity sha512-tUE3pNbxCMX0HPKvwurLBPRAOAdS0gNo1+MpoyFSqXI7b7sp6/TCBRht6qu1Luw+VyIzBtXkJdnnqU+Uoy8iow== - dependencies: - hyperlist "^1.0.0-beta" - lodash "^4.17.5" - sortablejs "^1.7.0" - -frappe-gantt@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/frappe-gantt/-/frappe-gantt-0.5.0.tgz#4dc7aa125f318efea64b4ae0e38f67a720238c1d" - integrity sha512-RAskVuBmnTcPJXh87oVhYmnNGy/9lvZlLHGui8QFB8yRBuUjzpZoZfZ+hKmDtBDmWNrE2/LRta06W5WmhTzzWQ== - -fresh@0.5.2: - version "0.5.2" - resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" - integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= - -fs-constants@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" - integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== - -fs-extra@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-1.0.0.tgz#cd3ce5f7e7cb6145883fcae3191e9877f8587950" - integrity sha1-zTzl9+fLYUWIP8rjGR6Yd/hYeVA= - dependencies: - graceful-fs "^4.1.2" - jsonfile "^2.1.0" - klaw "^1.0.0" - -fs-minipass@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" - integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== - dependencies: - minipass "^3.0.0" - -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= - -fstream@^1.0.0, fstream@^1.0.12: - version "1.0.12" - resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045" - integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg== - dependencies: - graceful-fs "^4.1.2" - inherits "~2.0.0" - mkdirp ">=0.5 0" - rimraf "2" - -function-bind@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" - integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== - -fuse.js@^3.4.6: - version "3.4.6" - resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-3.4.6.tgz#545c3411fed88bf2e27c457cab6e73e7af697a45" - integrity sha512-H6aJY4UpLFwxj1+5nAvufom5b2BT2v45P1MkPvdGIK8fWjQx/7o6tTT1+ALV0yawQvbmvCF0ufl2et8eJ7v7Cg== - -gauge@~2.7.3: - version "2.7.4" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" - integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= - dependencies: - aproba "^1.0.3" - console-control-strings "^1.0.0" - has-unicode "^2.0.0" - object-assign "^4.1.0" - signal-exit "^3.0.0" - string-width "^1.0.1" - strip-ansi "^3.0.1" - wide-align "^1.1.0" - -gaze@^1.0.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a" - integrity sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g== - dependencies: - globule "^1.0.0" - -generic-names@^1.0.2, generic-names@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/generic-names/-/generic-names-1.0.3.tgz#2d786a121aee508876796939e8e3bff836c20917" - integrity sha1-LXhqEhruUIh2eWk56OO/+DbCCRc= - dependencies: - loader-utils "^0.2.16" - -get-caller-file@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a" - integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w== - -get-caller-file@^2.0.1: - version "2.0.5" - resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" - integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== - -get-pixels@^3.2.3: - version "3.3.2" - resolved "https://registry.yarnpkg.com/get-pixels/-/get-pixels-3.3.2.tgz#3f62fb8811932c69f262bba07cba72b692b4ff03" - integrity sha512-6ar+8yPxRd1pskEcl2GSEu1La0+xYRjjnkby6AYiRDDwZ0tJbPQmHnSeH9fGLskT8kvR0OukVgtZLcsENF9YKQ== - dependencies: - data-uri-to-buffer "0.0.3" - jpeg-js "^0.3.2" - mime-types "^2.0.1" - ndarray "^1.0.13" - ndarray-pack "^1.1.1" - node-bitmap "0.0.1" - omggif "^1.0.5" - parse-data-uri "^0.2.0" - pngjs "^3.3.3" - request "^2.44.0" - through "^2.3.4" - -get-stdin@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe" - integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4= - -get-stream@^4.0.0, get-stream@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" - integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w== - dependencies: - pump "^3.0.0" - -get-stream@^5.1.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" - integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== - dependencies: - pump "^3.0.0" - -get-value@^2.0.3, get-value@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" - integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= - -getpass@^0.1.1: - version "0.1.7" - resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" - integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo= - dependencies: - assert-plus "^1.0.0" - -gl-mat2@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/gl-mat2/-/gl-mat2-1.0.1.tgz#142505730a5c2fe1e9f25d9ece3d0d6cc2710a30" - integrity sha1-FCUFcwpcL+Hp8l2ezj0NbMJxCjA= - -gl-vec2@^1.0.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/gl-vec2/-/gl-vec2-1.3.0.tgz#83d472ed46034de8e09cbc857123fb6c81c51199" - integrity sha512-YiqaAuNsheWmUV0Sa8k94kBB0D6RWjwZztyO+trEYS8KzJ6OQB/4686gdrf59wld4hHFIvaxynO3nRxpk1Ij/A== - -gl-vec3@^1.0.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/gl-vec3/-/gl-vec3-1.1.3.tgz#a47c62f918774a06cbed1b65bcd0288ecbb03826" - integrity sha512-jduKUqT0SGH02l8Yl+mV1yVsDfYgQAJyXGxkJQGyxPLHRiW25DwVIRPt6uvhrEMHftJfqhqKthRcyZqNEl9Xdw== - -glob@7.1.2: - version "7.1.2" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" - integrity sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ== - dependencies: - 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" - -glob@^7.0.0, glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.6, glob@~7.1.1: - version "7.1.6" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" - integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== - dependencies: - 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" - -global-agent@^2.1.12: - version "2.1.12" - resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-2.1.12.tgz#e4ae3812b731a9e81cbf825f9377ef450a8e4195" - integrity sha512-caAljRMS/qcDo69X9BfkgrihGUgGx44Fb4QQToNQjsiWh+YlQ66uqYVAdA8Olqit+5Ng0nkz09je3ZzANMZcjg== - dependencies: - boolean "^3.0.1" - core-js "^3.6.5" - es6-error "^4.1.1" - matcher "^3.0.0" - roarr "^2.15.3" - semver "^7.3.2" - serialize-error "^7.0.1" - -global-dirs@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.0.1.tgz#acdf3bb6685bcd55cb35e8a052266569e9469201" - integrity sha512-5HqUqdhkEovj2Of/ms3IeS/EekcO54ytHRLV4PEY2rhRwrHXLQjeVEES0Lhka0xwNDtGYn58wyC4s5+MHsOO6A== - dependencies: - ini "^1.3.5" - -global-modules@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea" - integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg== - dependencies: - global-prefix "^1.0.1" - is-windows "^1.0.1" - resolve-dir "^1.0.0" - -global-prefix@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe" - integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4= - dependencies: - expand-tilde "^2.0.2" - homedir-polyfill "^1.0.1" - ini "^1.3.4" - is-windows "^1.0.1" - which "^1.2.14" - -globalthis@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.2.tgz#2a235d34f4d8036219f7e34929b5de9e18166b8b" - integrity sha512-ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ== - dependencies: - define-properties "^1.1.3" - -globule@^1.0.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/globule/-/globule-1.3.2.tgz#d8bdd9e9e4eef8f96e245999a5dee7eb5d8529c4" - integrity sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA== - dependencies: - glob "~7.1.1" - lodash "~4.17.10" - minimatch "~3.0.2" - -got@11.4.0: - version "11.4.0" - resolved "https://registry.yarnpkg.com/got/-/got-11.4.0.tgz#1f0910310572af4efcc6890e1dacd7affb710b39" - integrity sha512-XysJZuZNVpaQ37Oo2LV90MIkPeYITehyy1A0QzO1JwOXm8EWuEf9eeGk2XuHePvLEGnm9AVOI37bHwD6KYyBtg== + "chalk" "^2.4.1" + "q" "^1.1.2" + +"code-point-at@^1.0.0": + "integrity" "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" + "resolved" "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz" + "version" "1.1.0" + +"codex-notifier@^1.1.2": + "integrity" "sha512-DCp6xe/LGueJ1N5sXEwcBc3r3PyVkEEDNWCVigfvywAkeXcZMk9K41a31tkEFBW0Ptlwji6/JlAb49E3Yrxbtg==" + "resolved" "https://registry.npmjs.org/codex-notifier/-/codex-notifier-1.1.2.tgz" + "version" "1.1.2" + +"codex-tooltip@^1.0.1": + "integrity" "sha512-oC+Bu5X/zyhbPydgMSLWKoM/+vkJMqaLWu3Dt/jZgXS3MWK23INwC5DMBrVXZSufAFk0i0SUni38k9rLMyZn/w==" + "resolved" "https://registry.npmjs.org/codex-tooltip/-/codex-tooltip-1.0.2.tgz" + "version" "1.0.2" + +"collection-visit@^1.0.0": + "integrity" "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=" + "resolved" "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz" + "version" "1.0.0" + dependencies: + "map-visit" "^1.0.0" + "object-visit" "^1.0.0" + +"color-convert@^1.9.0", "color-convert@^1.9.1": + "integrity" "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==" + "resolved" "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz" + "version" "1.9.3" + dependencies: + "color-name" "1.1.3" + +"color-convert@^2.0.1": + "integrity" "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==" + "resolved" "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz" + "version" "2.0.1" + dependencies: + "color-name" "~1.1.4" + +"color-name@^1.0.0", "color-name@~1.1.4": + "integrity" "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + "resolved" "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz" + "version" "1.1.4" + +"color-name@1.1.3": + "integrity" "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" + "resolved" "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz" + "version" "1.1.3" + +"color-string@^1.5.2": + "integrity" "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==" + "resolved" "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz" + "version" "1.5.3" + dependencies: + "color-name" "^1.0.0" + "simple-swizzle" "^0.2.2" + +"color@^3.0.0": + "integrity" "sha512-CwyopLkuRYO5ei2EpzpIh6LqJMt6Mt+jZhO5VI5f/wJLZriXQE32/SSqzmrh+QB+AZT81Cj8yv+7zwToW8ahZg==" + "resolved" "https://registry.npmjs.org/color/-/color-3.1.0.tgz" + "version" "3.1.0" + dependencies: + "color-convert" "^1.9.1" + "color-string" "^1.5.2" + +"color@3.0.x": + "integrity" "sha512-jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w==" + "resolved" "https://registry.npmjs.org/color/-/color-3.0.0.tgz" + "version" "3.0.0" + dependencies: + "color-convert" "^1.9.1" + "color-string" "^1.5.2" + +"colorette@^1.2.1": + "integrity" "sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==" + "resolved" "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz" + "version" "1.2.1" + +"colors@^1.2.1": + "integrity" "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==" + "resolved" "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz" + "version" "1.4.0" + +"colorspace@1.1.x": + "integrity" "sha512-vt+OoIP2d76xLhjwbBaucYlNSpPsrJWPlBTtwCpQKIu6/CSMutyzX93O/Do0qzpH3YoHEes8YEFXyZ797rEhzQ==" + "resolved" "https://registry.npmjs.org/colorspace/-/colorspace-1.1.2.tgz" + "version" "1.1.2" + dependencies: + "color" "3.0.x" + "text-hex" "1.0.x" + +"combined-stream@^1.0.6", "combined-stream@~1.0.6": + "integrity" "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==" + "resolved" "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz" + "version" "1.0.8" + dependencies: + "delayed-stream" "~1.0.0" + +"commander@^2.19.0": + "integrity" "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==" + "resolved" "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz" + "version" "2.20.0" + +"commander@2.15.1": + "integrity" "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==" + "resolved" "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz" + "version" "2.15.1" + +"component-bind@1.0.0": + "integrity" "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=" + "resolved" "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz" + "version" "1.0.0" + +"component-emitter@^1.2.0", "component-emitter@^1.2.1", "component-emitter@1.2.1": + "integrity" "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=" + "resolved" "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz" + "version" "1.2.1" + +"component-emitter@~1.3.0": + "integrity" "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==" + "resolved" "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz" + "version" "1.3.0" + +"component-inherit@0.0.3": + "integrity" "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=" + "resolved" "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz" + "version" "0.0.3" + +"concat-map@0.0.1": + "integrity" "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + "resolved" "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" + "version" "0.0.1" + +"concat-stream@^1.6.2": + "integrity" "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==" + "resolved" "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz" + "version" "1.6.2" + dependencies: + "buffer-from" "^1.0.0" + "inherits" "^2.0.3" + "readable-stream" "^2.2.2" + "typedarray" "^0.0.6" + +"concat-with-sourcemaps@^1.0.5": + "integrity" "sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==" + "resolved" "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz" + "version" "1.1.0" + dependencies: + "source-map" "^0.6.1" + +"configstore@^5.0.1": + "integrity" "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==" + "resolved" "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz" + "version" "5.0.1" + dependencies: + "dot-prop" "^5.2.0" + "graceful-fs" "^4.1.2" + "make-dir" "^3.0.0" + "unique-string" "^2.0.0" + "write-file-atomic" "^3.0.0" + "xdg-basedir" "^4.0.0" + +"console-control-strings@^1.0.0", "console-control-strings@~1.1.0": + "integrity" "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" + "resolved" "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz" + "version" "1.1.0" + +"consolidate@^0.15.1": + "integrity" "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==" + "resolved" "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz" + "version" "0.15.1" + dependencies: + "bluebird" "^3.1.1" + +"content-disposition@0.5.3": + "integrity" "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==" + "resolved" "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz" + "version" "0.5.3" + dependencies: + "safe-buffer" "5.1.2" + +"content-type@~1.0.4": + "integrity" "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==" + "resolved" "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz" + "version" "1.0.4" + +"cookie-signature@1.0.6": + "integrity" "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" + "resolved" "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz" + "version" "1.0.6" + +"cookie@^0.4.0", "cookie@0.4.0": + "integrity" "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==" + "resolved" "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz" + "version" "0.4.0" + +"cookie@~0.4.1": + "integrity" "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==" + "resolved" "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz" + "version" "0.4.1" + +"cookiejar@^2.1.0": + "integrity" "sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==" + "resolved" "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz" + "version" "2.1.2" + +"copy-descriptor@^0.1.0": + "integrity" "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=" + "resolved" "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz" + "version" "0.1.1" + +"core-js@^2.4.0": + "integrity" "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==" + "resolved" "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz" + "version" "2.6.11" + +"core-js@^3.6.5": + "integrity" "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==" + "resolved" "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz" + "version" "3.6.5" + +"core-util-is@~1.0.0", "core-util-is@1.0.2": + "integrity" "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + "resolved" "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" + "version" "1.0.2" + +"cosmiconfig@^4.0.0": + "integrity" "sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==" + "resolved" "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-4.0.0.tgz" + "version" "4.0.0" + dependencies: + "is-directory" "^0.3.1" + "js-yaml" "^3.9.0" + "parse-json" "^4.0.0" + "require-from-string" "^2.0.1" + +"cosmiconfig@^5.0.0": + "integrity" "sha512-kCNPvthka8gvLtzAxQXvWo4FxqRB+ftRZyPZNuab5ngvM9Y7yw7hbEysglptLgpkGX9nAOKTBVkHUAe8xtYR6Q==" + "resolved" "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.1.0.tgz" + "version" "5.1.0" + dependencies: + "import-fresh" "^2.0.0" + "is-directory" "^0.3.1" + "js-yaml" "^3.9.0" + "lodash.get" "^4.4.2" + "parse-json" "^4.0.0" + +"cross-spawn@^3.0.0": + "integrity" "sha1-ElYDfsufDF9549bvE14wdwGEuYI=" + "resolved" "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz" + "version" "3.0.1" + dependencies: + "lru-cache" "^4.0.1" + "which" "^1.2.9" + +"cross-spawn@^6.0.0": + "integrity" "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==" + "resolved" "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz" + "version" "6.0.5" + dependencies: + "nice-try" "^1.0.4" + "path-key" "^2.0.1" + "semver" "^5.5.0" + "shebang-command" "^1.2.0" + "which" "^1.2.9" + +"crypto-random-string@^2.0.0": + "integrity" "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==" + "resolved" "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz" + "version" "2.0.0" + +"css-color-names@^0.0.4", "css-color-names@0.0.4": + "integrity" "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=" + "resolved" "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz" + "version" "0.0.4" + +"css-declaration-sorter@^4.0.1": + "integrity" "sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==" + "resolved" "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz" + "version" "4.0.1" + dependencies: + "postcss" "^7.0.1" + "timsort" "^0.3.0" + +"css-modules-loader-core@^1.1.0": + "integrity" "sha1-WQhmgpShvs0mGuCkziGwtVHyHRY=" + "resolved" "https://registry.npmjs.org/css-modules-loader-core/-/css-modules-loader-core-1.1.0.tgz" + "version" "1.1.0" + dependencies: + "icss-replace-symbols" "1.1.0" + "postcss" "6.0.1" + "postcss-modules-extract-imports" "1.1.0" + "postcss-modules-local-by-default" "1.2.0" + "postcss-modules-scope" "1.1.0" + "postcss-modules-values" "1.3.0" + +"css-select-base-adapter@^0.1.1": + "integrity" "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==" + "resolved" "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz" + "version" "0.1.1" + +"css-select@^2.0.0": + "integrity" "sha512-dSpYaDVoWaELjvZ3mS6IKZM/y2PMPa/XYoEfYNZePL4U/XgyxZNroHEHReDx/d+VgXh9VbCTtFqLkFbmeqeaRQ==" + "resolved" "https://registry.npmjs.org/css-select/-/css-select-2.0.2.tgz" + "version" "2.0.2" + dependencies: + "boolbase" "^1.0.0" + "css-what" "^2.1.2" + "domutils" "^1.7.0" + "nth-check" "^1.0.2" + +"css-selector-parser@^1.3.0": + "integrity" "sha512-HYPSb7y/Z7BNDCOrakL4raGO2zltZkbeXyAd6Tg9obzix6QhzxCotdBl6VT0Dv4vZfJGVz3WL/xaEI9Ly3ul0g==" + "resolved" "https://registry.npmjs.org/css-selector-parser/-/css-selector-parser-1.4.1.tgz" + "version" "1.4.1" + +"css-selector-tokenizer@^0.7.0": + "integrity" "sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==" + "resolved" "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz" + "version" "0.7.1" + dependencies: + "cssesc" "^0.1.0" + "fastparse" "^1.1.1" + "regexpu-core" "^1.0.0" + +"css-tree@1.0.0-alpha.28": + "integrity" "sha512-joNNW1gCp3qFFzj4St6zk+Wh/NBv0vM5YbEreZk0SD4S23S+1xBKb6cLDg2uj4P4k/GUMlIm6cKIDqIG+vdt0w==" + "resolved" "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.28.tgz" + "version" "1.0.0-alpha.28" + dependencies: + "mdn-data" "~1.1.0" + "source-map" "^0.5.3" + +"css-tree@1.0.0-alpha.29": + "integrity" "sha512-sRNb1XydwkW9IOci6iB2xmy8IGCj6r/fr+JWitvJ2JxQRPzN3T4AGGVWCMlVmVwM1gtgALJRmGIlWv5ppnGGkg==" + "resolved" "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.29.tgz" + "version" "1.0.0-alpha.29" + dependencies: + "mdn-data" "~1.1.0" + "source-map" "^0.5.3" + +"css-tree@1.0.0-alpha.37": + "integrity" "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==" + "resolved" "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz" + "version" "1.0.0-alpha.37" + dependencies: + "mdn-data" "2.0.4" + "source-map" "^0.6.1" + +"css-tree@1.0.0-alpha.39": + "integrity" "sha512-7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA==" + "resolved" "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.39.tgz" + "version" "1.0.0-alpha.39" + dependencies: + "mdn-data" "2.0.6" + "source-map" "^0.6.1" + +"css-unit-converter@^1.1.1": + "integrity" "sha1-2bkoGtz9jO2TW9urqDeGiX9k6ZY=" + "resolved" "https://registry.npmjs.org/css-unit-converter/-/css-unit-converter-1.1.1.tgz" + "version" "1.1.1" + +"css-url-regex@^1.1.0": + "integrity" "sha1-g4NCMMyfdMRX3lnuvRVD/uuDt+w=" + "resolved" "https://registry.npmjs.org/css-url-regex/-/css-url-regex-1.1.0.tgz" + "version" "1.1.0" + +"css-what@^2.1.2": + "integrity" "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==" + "resolved" "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz" + "version" "2.1.3" + +"cssesc@^0.1.0": + "integrity" "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=" + "resolved" "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz" + "version" "0.1.0" + +"cssesc@^2.0.0": + "integrity" "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==" + "resolved" "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz" + "version" "2.0.0" + +"cssmin@^0.4.3": + "integrity" "sha1-yRlAd+Dr2s1pHV9ZAVudgZ840BU=" + "resolved" "https://registry.npmjs.org/cssmin/-/cssmin-0.4.3.tgz" + "version" "0.4.3" + +"cssnano-preset-default@^4.0.7": + "integrity" "sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA==" + "resolved" "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz" + "version" "4.0.7" + dependencies: + "css-declaration-sorter" "^4.0.1" + "cssnano-util-raw-cache" "^4.0.1" + "postcss" "^7.0.0" + "postcss-calc" "^7.0.1" + "postcss-colormin" "^4.0.3" + "postcss-convert-values" "^4.0.1" + "postcss-discard-comments" "^4.0.2" + "postcss-discard-duplicates" "^4.0.2" + "postcss-discard-empty" "^4.0.1" + "postcss-discard-overridden" "^4.0.1" + "postcss-merge-longhand" "^4.0.11" + "postcss-merge-rules" "^4.0.3" + "postcss-minify-font-values" "^4.0.2" + "postcss-minify-gradients" "^4.0.2" + "postcss-minify-params" "^4.0.2" + "postcss-minify-selectors" "^4.0.2" + "postcss-normalize-charset" "^4.0.1" + "postcss-normalize-display-values" "^4.0.2" + "postcss-normalize-positions" "^4.0.2" + "postcss-normalize-repeat-style" "^4.0.2" + "postcss-normalize-string" "^4.0.2" + "postcss-normalize-timing-functions" "^4.0.2" + "postcss-normalize-unicode" "^4.0.1" + "postcss-normalize-url" "^4.0.1" + "postcss-normalize-whitespace" "^4.0.2" + "postcss-ordered-values" "^4.1.2" + "postcss-reduce-initial" "^4.0.3" + "postcss-reduce-transforms" "^4.0.2" + "postcss-svgo" "^4.0.2" + "postcss-unique-selectors" "^4.0.1" + +"cssnano-util-get-arguments@^4.0.0": + "integrity" "sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8=" + "resolved" "https://registry.npmjs.org/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz" + "version" "4.0.0" + +"cssnano-util-get-match@^4.0.0": + "integrity" "sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0=" + "resolved" "https://registry.npmjs.org/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz" + "version" "4.0.0" + +"cssnano-util-raw-cache@^4.0.1": + "integrity" "sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==" + "resolved" "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz" + "version" "4.0.1" + dependencies: + "postcss" "^7.0.0" + +"cssnano-util-same-parent@^4.0.0": + "integrity" "sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==" + "resolved" "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz" + "version" "4.0.1" + +"cssnano@^4.1.10", "cssnano@^4.1.8": + "integrity" "sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ==" + "resolved" "https://registry.npmjs.org/cssnano/-/cssnano-4.1.10.tgz" + "version" "4.1.10" + dependencies: + "cosmiconfig" "^5.0.0" + "cssnano-preset-default" "^4.0.7" + "is-resolvable" "^1.0.0" + "postcss" "^7.0.0" + +"csso@^3.5.1": + "integrity" "sha512-vrqULLffYU1Q2tLdJvaCYbONStnfkfimRxXNaGjxMldI0C7JPBC4rB1RyjhfdZ4m1frm8pM9uRPKH3d2knZ8gg==" + "resolved" "https://registry.npmjs.org/csso/-/csso-3.5.1.tgz" + "version" "3.5.1" + dependencies: + "css-tree" "1.0.0-alpha.29" + +"csso@^4.0.2": + "integrity" "sha512-NL3spysxUkcrOgnpsT4Xdl2aiEiBG6bXswAABQVHcMrfjjBisFOKwLDOmf4wf32aPdcJws1zds2B0Rg+jqMyHQ==" + "resolved" "https://registry.npmjs.org/csso/-/csso-4.0.3.tgz" + "version" "4.0.3" + dependencies: + "css-tree" "1.0.0-alpha.39" + +"cssom@^0.3.4": + "integrity" "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==" + "resolved" "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz" + "version" "0.3.8" + +"currently-unhandled@^0.4.1": + "integrity" "sha1-mI3zP+qxke95mmE2nddsF635V+o=" + "resolved" "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz" + "version" "0.4.1" + dependencies: + "array-find-index" "^1.0.1" + +"custom-event-polyfill@^1.0.7": + "integrity" "sha512-TDDkd5DkaZxZFM8p+1I3yAlvM3rSr1wbrOliG4yJiwinMZN8z/iGL7BTlDkrJcYTmgUSb4ywVCc3ZaUtOtC76w==" + "resolved" "https://registry.npmjs.org/custom-event-polyfill/-/custom-event-polyfill-1.0.7.tgz" + "version" "1.0.7" + +"cwise-compiler@^1.1.2": + "integrity" "sha1-9NZnQQ6FDToxOn0tt7HlBbsDTMU=" + "resolved" "https://registry.npmjs.org/cwise-compiler/-/cwise-compiler-1.1.3.tgz" + "version" "1.1.3" + dependencies: + "uniq" "^1.0.0" + +"dashdash@^1.12.0": + "integrity" "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=" + "resolved" "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz" + "version" "1.14.1" + dependencies: + "assert-plus" "^1.0.0" + +"data-uri-to-buffer@0.0.3": + "integrity" "sha1-GK6XmmoMqZSwYlhTkW0mYruuCxo=" + "resolved" "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-0.0.3.tgz" + "version" "0.0.3" + +"dateformat@^3.0.3": + "integrity" "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==" + "resolved" "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz" + "version" "3.0.3" + +"de-indent@^1.0.2": + "integrity" "sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0=" + "resolved" "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz" + "version" "1.0.2" + +"debug@^2.2.0": + "integrity" "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==" + "resolved" "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz" + "version" "2.6.9" + dependencies: + "ms" "2.0.0" + +"debug@^2.3.3": + "integrity" "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==" + "resolved" "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz" + "version" "2.6.9" + dependencies: + "ms" "2.0.0" + +"debug@^2.6.0": + "integrity" "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==" + "resolved" "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz" + "version" "2.6.9" + dependencies: + "ms" "2.0.0" + +"debug@^2.6.9": + "integrity" "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==" + "resolved" "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz" + "version" "2.6.9" + dependencies: + "ms" "2.0.0" + +"debug@^3.0.1": + "integrity" "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==" + "resolved" "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz" + "version" "3.2.7" + dependencies: + "ms" "^2.1.1" + +"debug@^3.1.0": + "integrity" "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==" + "resolved" "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz" + "version" "3.2.6" + dependencies: + "ms" "^2.1.1" + +"debug@^3.2.6": + "integrity" "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==" + "resolved" "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz" + "version" "3.2.6" + dependencies: + "ms" "^2.1.1" + +"debug@^4.1.1", "debug@~4.1.0": + "integrity" "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==" + "resolved" "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz" + "version" "4.1.1" + dependencies: + "ms" "^2.1.1" + +"debug@^4.2.0": + "integrity" "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==" + "resolved" "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz" + "version" "4.3.1" + dependencies: + "ms" "2.1.2" + +"debug@^4.3.1": + "integrity" "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==" + "resolved" "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz" + "version" "4.3.1" + dependencies: + "ms" "2.1.2" + +"debug@~3.1.0": + "integrity" "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==" + "resolved" "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz" + "version" "3.1.0" + dependencies: + "ms" "2.0.0" + +"debug@2.6.9": + "integrity" "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==" + "resolved" "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz" + "version" "2.6.9" + dependencies: + "ms" "2.0.0" + +"debug@3.1.0": + "integrity" "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==" + "resolved" "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz" + "version" "3.1.0" + dependencies: + "ms" "2.0.0" + +"decamelize@^1.1.2", "decamelize@^1.2.0": + "integrity" "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" + "resolved" "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz" + "version" "1.2.0" + +"decode-uri-component@^0.2.0": + "integrity" "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=" + "resolved" "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz" + "version" "0.2.0" + +"decompress-response@^3.3.0": + "integrity" "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=" + "resolved" "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz" + "version" "3.3.0" + dependencies: + "mimic-response" "^1.0.0" + +"decompress-response@^6.0.0": + "integrity" "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==" + "resolved" "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz" + "version" "6.0.0" + dependencies: + "mimic-response" "^3.1.0" + +"deep-equal@^1.0.1": + "integrity" "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=" + "resolved" "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz" + "version" "1.0.1" + +"deep-equal@^2.0.2": + "integrity" "sha512-Spqdl4H+ky45I9ByyJtXteOm9CaIrPmnIPmOhrkKGNYWeDgCvJ8jNYVCTjChxW4FqGuZnLHADc8EKRMX6+CgvA==" + "resolved" "https://registry.npmjs.org/deep-equal/-/deep-equal-2.0.3.tgz" + "version" "2.0.3" + dependencies: + "es-abstract" "^1.17.5" + "es-get-iterator" "^1.1.0" + "is-arguments" "^1.0.4" + "is-date-object" "^1.0.2" + "is-regex" "^1.0.5" + "isarray" "^2.0.5" + "object-is" "^1.1.2" + "object-keys" "^1.1.1" + "object.assign" "^4.1.0" + "regexp.prototype.flags" "^1.3.0" + "side-channel" "^1.0.2" + "which-boxed-primitive" "^1.0.1" + "which-collection" "^1.0.1" + "which-typed-array" "^1.1.2" + +"deep-extend@^0.6.0": + "integrity" "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==" + "resolved" "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz" + "version" "0.6.0" + +"defaults@^1.0.3": + "integrity" "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=" + "resolved" "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz" + "version" "1.0.3" + dependencies: + "clone" "^1.0.2" + +"defer-to-connect@^1.0.1": + "integrity" "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==" + "resolved" "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz" + "version" "1.1.3" + +"defer-to-connect@^2.0.0": + "integrity" "sha512-bYL2d05vOSf1JEZNx5vSAtPuBMkX8K9EUutg7zlKvTqKXHt7RhWJFbmd7qakVuf13i+IkGmp6FwSsONOf6VYIg==" + "resolved" "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.0.tgz" + "version" "2.0.0" + +"define-properties@^1.1.2", "define-properties@^1.1.3": + "integrity" "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==" + "resolved" "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz" + "version" "1.1.3" + dependencies: + "object-keys" "^1.0.12" + +"define-property@^0.2.5": + "integrity" "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=" + "resolved" "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz" + "version" "0.2.5" + dependencies: + "is-descriptor" "^0.1.0" + +"define-property@^1.0.0": + "integrity" "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=" + "resolved" "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz" + "version" "1.0.0" + dependencies: + "is-descriptor" "^1.0.0" + +"define-property@^2.0.2": + "integrity" "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==" + "resolved" "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz" + "version" "2.0.2" + dependencies: + "is-descriptor" "^1.0.2" + "isobject" "^3.0.1" + +"delayed-stream@~1.0.0": + "integrity" "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" + "resolved" "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz" + "version" "1.0.0" + +"delegates@^1.0.0": + "integrity" "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" + "resolved" "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz" + "version" "1.0.0" + +"denque@^1.5.0": + "integrity" "sha512-CYiCSgIF1p6EUByQPlGkKnP1M9g0ZV3qMIrqMqZqdwazygIA/YP2vrbcyl1h/WppKJTdl1F85cXIle+394iDAQ==" + "resolved" "https://registry.npmjs.org/denque/-/denque-1.5.0.tgz" + "version" "1.5.0" + +"depd@~1.1.2": + "integrity" "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" + "resolved" "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz" + "version" "1.1.2" + +"destroy@~1.0.4": + "integrity" "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" + "resolved" "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz" + "version" "1.0.4" + +"detect-node@^2.0.4": + "integrity" "sha512-qi86tE6hRcFHy8jI1m2VG+LaPUR1LhqDa5G8tVjuUXmOrpuAgqsA1pN0+ldgr3aKUH+QLI9hCY/OcRYisERejw==" + "resolved" "https://registry.npmjs.org/detect-node/-/detect-node-2.0.5.tgz" + "version" "2.0.5" + +"diff@^4.0.1": + "integrity" "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==" + "resolved" "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz" + "version" "4.0.2" + +"diff@3.5.0": + "integrity" "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==" + "resolved" "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz" + "version" "3.5.0" + +"docker-modem@2.1.3": + "integrity" "sha512-cwaRptBmYZwu/FyhGcqBm2MzXA77W2/E6eVkpOZVDk6PkI9Bjj84xPrXiHMA+OWjzNy+DFjgKh8Q+1hMR7/OHg==" + "resolved" "https://registry.npmjs.org/docker-modem/-/docker-modem-2.1.3.tgz" + "version" "2.1.3" + dependencies: + "debug" "^4.1.1" + "readable-stream" "^3.5.0" + "split-ca" "^1.0.1" + "ssh2" "^0.8.7" + +"dockerfile-ast@0.2.0": + "integrity" "sha512-iQyp12k1A4tF3sEfLAq2wfFPKdpoiGTJeuiu2Y1bdEqIZu0DfSSL2zm0fk7a/UHeQkngnYaRRGuON+C+2LO1Fw==" + "resolved" "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.2.0.tgz" + "version" "0.2.0" + dependencies: + "vscode-languageserver-types" "^3.16.0" + +"dom-serializer@0": + "integrity" "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==" + "resolved" "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz" + "version" "0.1.1" + dependencies: + "domelementtype" "^1.3.0" + "entities" "^1.1.1" + +"domelementtype@^1.3.0", "domelementtype@1": + "integrity" "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==" + "resolved" "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz" + "version" "1.3.1" + +"domutils@^1.7.0": + "integrity" "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==" + "resolved" "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz" + "version" "1.7.0" + dependencies: + "dom-serializer" "0" + "domelementtype" "1" + +"dot-prop@^4.1.1": + "integrity" "sha512-l0p4+mIuJIua0mhxGoh4a+iNL9bmeK5DvnSVQa6T0OhrVmaEa1XScX5Etc673FePCJOArq/4Pa2cLGODUWTPOQ==" + "resolved" "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.1.tgz" + "version" "4.2.1" + dependencies: + "is-obj" "^1.0.0" + +"dot-prop@^5.2.0": + "integrity" "sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==" + "resolved" "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz" + "version" "5.2.0" + dependencies: + "is-obj" "^2.0.0" + +"dotnet-deps-parser@5.0.0": + "integrity" "sha512-1l9K4UnQQHSfKgeHeLrxnB53AidCZqPyf9dkRL4/fZl8//NPiiDD43zHtgylw8DHlO7gvM8+O5a0UPHesNYZKw==" + "resolved" "https://registry.npmjs.org/dotnet-deps-parser/-/dotnet-deps-parser-5.0.0.tgz" + "version" "5.0.0" + dependencies: + "lodash.isempty" "^4.4.0" + "lodash.set" "^4.3.2" + "lodash.uniq" "^4.5.0" + "source-map-support" "^0.5.7" + "tslib" "^1.10.0" + "xml2js" "0.4.23" + +"driver.js@^0.9.8": + "integrity" "sha512-bczjyKdX6XmFyCDkwtRmlaORDwfBk1xXmRO0CAe5VwNQTM98aWaG2LAIiIdTe53iV/B7W5lXlIy2xYtf0JRb7Q==" + "resolved" "https://registry.npmjs.org/driver.js/-/driver.js-0.9.8.tgz" + "version" "0.9.8" + +"duplexer3@^0.1.4": + "integrity" "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=" + "resolved" "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz" + "version" "0.1.4" + +"duplexify@^3.5.0", "duplexify@^3.6.0": + "integrity" "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==" + "resolved" "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz" + "version" "3.7.1" + dependencies: + "end-of-stream" "^1.0.0" + "inherits" "^2.0.1" + "readable-stream" "^2.0.0" + "stream-shift" "^1.0.0" + +"ecc-jsbn@~0.1.1": + "integrity" "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=" + "resolved" "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz" + "version" "0.1.2" + dependencies: + "jsbn" "~0.1.0" + "safer-buffer" "^2.1.0" + +"editorjs-undo@^0.1.5": + "integrity" "sha512-+qRmTe7Asn9KrsYHMCtNQi6rCBa+qrinJx/p7/Hj8K62HFzhMEuy7aMRbADd/KqcV2AsPVzgCj3PMHPmb6ZAkA==" + "resolved" "https://registry.npmjs.org/editorjs-undo/-/editorjs-undo-0.1.5.tgz" + "version" "0.1.5" + +"ee-first@1.1.1": + "integrity" "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" + "resolved" "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz" + "version" "1.1.1" + +"electron-to-chromium@^1.3.113": + "integrity" "sha512-De+lPAxEcpxvqPTyZAXELNpRZXABRxf+uL/rSykstQhzj/B0l1150G/ExIIxKc16lI89Hgz81J0BHAcbTqK49g==" + "resolved" "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.113.tgz" + "version" "1.3.113" + +"electron-to-chromium@^1.3.523": + "integrity" "sha512-11qcm2xvf2kqeFO5EIejaBx5cKXsW1quAyv3VctCMYwofnyVZLs97y6LCekss3/ghQpr7PYkSO3uId5FmxZsdw==" + "resolved" "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.551.tgz" + "version" "1.3.551" + +"elfy@^1.0.0": + "integrity" "sha512-4Kp3AA94jC085IJox+qnvrZ3PudqTi4gQNvIoTZfJJ9IqkRuCoqP60vCVYlIg00c5aYusi5Wjh2bf0cHYt+6gQ==" + "resolved" "https://registry.npmjs.org/elfy/-/elfy-1.0.0.tgz" + "version" "1.0.0" + dependencies: + "endian-reader" "^0.3.0" + +"email-validator@^2.0.4": + "integrity" "sha512-gYCwo7kh5S3IDyZPLZf6hSS0MnZT8QmJFqYvbqlDZSbwdZlY6QZWxJ4i/6UhITOJ4XzyI647Bm2MXKCLqnJ4nQ==" + "resolved" "https://registry.npmjs.org/email-validator/-/email-validator-2.0.4.tgz" + "version" "2.0.4" + +"emoji-regex@^7.0.1": + "integrity" "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" + "resolved" "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz" + "version" "7.0.3" + +"emoji-regex@^8.0.0": + "integrity" "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + "resolved" "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz" + "version" "8.0.0" + +"emojis-list@^2.0.0": + "integrity" "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=" + "resolved" "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz" + "version" "2.1.0" + +"enabled@2.0.x": + "integrity" "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==" + "resolved" "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz" + "version" "2.0.0" + +"encodeurl@~1.0.2": + "integrity" "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=" + "resolved" "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz" + "version" "1.0.2" + +"end-of-stream@^1.0.0", "end-of-stream@^1.1.0", "end-of-stream@^1.4.1": + "integrity" "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==" + "resolved" "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz" + "version" "1.4.4" + dependencies: + "once" "^1.4.0" + +"endian-reader@^0.3.0": + "integrity" "sha1-hOykNrgK7Q0GOcRykTOLky7+UKA=" + "resolved" "https://registry.npmjs.org/endian-reader/-/endian-reader-0.3.0.tgz" + "version" "0.3.0" + +"engine.io-client@~3.5.0": + "integrity" "sha512-12wPRfMrugVw/DNyJk34GQ5vIVArEcVMXWugQGGuw2XxUSztFNmJggZmv8IZlLyEdnpO1QB9LkcjeWewO2vxtA==" + "resolved" "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.5.0.tgz" + "version" "3.5.0" + dependencies: + "component-emitter" "~1.3.0" + "component-inherit" "0.0.3" + "debug" "~3.1.0" + "engine.io-parser" "~2.2.0" + "has-cors" "1.1.0" + "indexof" "0.0.1" + "parseqs" "0.0.6" + "parseuri" "0.0.6" + "ws" "~7.4.2" + "xmlhttprequest-ssl" "~1.5.4" + "yeast" "0.1.2" + +"engine.io-parser@~2.2.0": + "integrity" "sha512-6I3qD9iUxotsC5HEMuuGsKA0cXerGz+4uGcXQEkfBidgKf0amsjrrtwcbwK/nzpZBxclXlV7gGl9dgWvu4LF6w==" + "resolved" "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.2.0.tgz" + "version" "2.2.0" + dependencies: + "after" "0.8.2" + "arraybuffer.slice" "~0.0.7" + "base64-arraybuffer" "0.1.5" + "blob" "0.0.5" + "has-binary2" "~1.0.2" + +"engine.io@~3.5.0": + "integrity" "sha512-21HlvPUKaitDGE4GXNtQ7PLP0Sz4aWLddMPw2VTyFz1FVZqu/kZsJUO8WNpKuE/OCL7nkfRaOui2ZCJloGznGA==" + "resolved" "https://registry.npmjs.org/engine.io/-/engine.io-3.5.0.tgz" + "version" "3.5.0" + dependencies: + "accepts" "~1.3.4" + "base64id" "2.0.0" + "cookie" "~0.4.1" + "debug" "~4.1.0" + "engine.io-parser" "~2.2.0" + "ws" "~7.4.2" + +"entities@^1.1.1": + "integrity" "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==" + "resolved" "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz" + "version" "1.1.2" + +"errno@^0.1.1": + "integrity" "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==" + "resolved" "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz" + "version" "0.1.7" + dependencies: + "prr" "~1.0.1" + +"error-ex@^1.2.0", "error-ex@^1.3.1": + "integrity" "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==" + "resolved" "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz" + "version" "1.3.2" + dependencies: + "is-arrayish" "^0.2.1" + +"es-abstract@^1.12.0": + "integrity" "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==" + "resolved" "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz" + "version" "1.13.0" + dependencies: + "es-to-primitive" "^1.2.0" + "function-bind" "^1.1.1" + "has" "^1.0.3" + "is-callable" "^1.1.4" + "is-regex" "^1.0.4" + "object-keys" "^1.0.12" + +"es-abstract@^1.17.0-next.1", "es-abstract@^1.17.4", "es-abstract@^1.17.5": + "integrity" "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==" + "resolved" "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz" + "version" "1.17.5" + dependencies: + "es-to-primitive" "^1.2.1" + "function-bind" "^1.1.1" + "has" "^1.0.3" + "has-symbols" "^1.0.1" + "is-callable" "^1.1.5" + "is-regex" "^1.0.5" + "object-inspect" "^1.7.0" + "object-keys" "^1.1.1" + "object.assign" "^4.1.0" + "string.prototype.trimleft" "^2.1.1" + "string.prototype.trimright" "^2.1.1" + +"es-abstract@^1.5.1": + "integrity" "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==" + "resolved" "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz" + "version" "1.13.0" + dependencies: + "es-to-primitive" "^1.2.0" + "function-bind" "^1.1.1" + "has" "^1.0.3" + "is-callable" "^1.1.4" + "is-regex" "^1.0.4" + "object-keys" "^1.0.12" + +"es-get-iterator@^1.1.0": + "integrity" "sha512-UfrmHuWQlNMTs35e1ypnvikg6jCz3SK8v8ImvmDsh36fCVUR1MqoFDiyn0/k52C8NqO3YsO8Oe0azeesNuqSsQ==" + "resolved" "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.0.tgz" + "version" "1.1.0" + dependencies: + "es-abstract" "^1.17.4" + "has-symbols" "^1.0.1" + "is-arguments" "^1.0.4" + "is-map" "^2.0.1" + "is-set" "^2.0.1" + "is-string" "^1.0.5" + "isarray" "^2.0.5" + +"es-to-primitive@^1.2.0": + "integrity" "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==" + "resolved" "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz" + "version" "1.2.0" + dependencies: + "is-callable" "^1.1.4" + "is-date-object" "^1.0.1" + "is-symbol" "^1.0.2" + +"es-to-primitive@^1.2.1": + "integrity" "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==" + "resolved" "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz" + "version" "1.2.1" + dependencies: + "is-callable" "^1.1.4" + "is-date-object" "^1.0.1" + "is-symbol" "^1.0.2" + +"es6-error@^4.1.1": + "integrity" "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==" + "resolved" "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz" + "version" "4.1.1" + +"es6-promise@^4.0.3": + "integrity" "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==" + "resolved" "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz" + "version" "4.2.8" + +"escalade@^3.0.2": + "integrity" "sha512-gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ==" + "resolved" "https://registry.npmjs.org/escalade/-/escalade-3.0.2.tgz" + "version" "3.0.2" + +"escape-goat@^2.0.0": + "integrity" "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==" + "resolved" "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz" + "version" "2.1.1" + +"escape-html@~1.0.3": + "integrity" "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" + "resolved" "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz" + "version" "1.0.3" + +"escape-string-regexp@^1.0.2", "escape-string-regexp@^1.0.5", "escape-string-regexp@1.0.5": + "integrity" "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" + "resolved" "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" + "version" "1.0.5" + +"escape-string-regexp@^4.0.0": + "integrity" "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==" + "resolved" "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz" + "version" "4.0.0" + +"esprima@^4.0.0": + "integrity" "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" + "resolved" "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz" + "version" "4.0.1" + +"estree-walker@^0.5.0": + "integrity" "sha512-XpCnW/AE10ws/kDAs37cngSkvgIR8aN3G0MS85m7dUpuK2EREo9VJ00uvw6Dg/hXEpfsE1I1TvJOJr+Z+TL+ig==" + "resolved" "https://registry.npmjs.org/estree-walker/-/estree-walker-0.5.2.tgz" + "version" "0.5.2" + +"estree-walker@^0.6.0": + "integrity" "sha512-peq1RfVAVzr3PU/jL31RaOjUKLoZJpObQWJJ+LgfcxDUifyLZ1RjPQZTl0pzj2uJ45b7A7XpyppXvxdEqzo4rw==" + "resolved" "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.0.tgz" + "version" "0.6.0" + +"esutils@^2.0.2": + "integrity" "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=" + "resolved" "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz" + "version" "2.0.2" + +"etag@~1.8.1": + "integrity" "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" + "resolved" "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz" + "version" "1.8.1" + +"event-loop-spinner@^2.0.0": + "integrity" "sha512-1y4j/Mhttr8ordvHkbDsGzGrlQaSYJoXD/3YKUxiOXIk7myEn9UPfybEk/lLtrcU3D4QvCNmVUxVQaPtvAIaUw==" + "resolved" "https://registry.npmjs.org/event-loop-spinner/-/event-loop-spinner-2.0.0.tgz" + "version" "2.0.0" + dependencies: + "tslib" "^1.10.0" + +"event-loop-spinner@^2.1.0": + "integrity" "sha512-RJ10wL8/F9AlfBgRCvYctJIXSb9XkVmSCK3GGUvPD3dJrvTjDeDT0tmhcbEC6I2NEjNM9xD38HQJ4F/f/gb4VQ==" + "resolved" "https://registry.npmjs.org/event-loop-spinner/-/event-loop-spinner-2.1.0.tgz" + "version" "2.1.0" + dependencies: + "tslib" "^2.1.0" + +"eventemitter3@^2.0.3": + "integrity" "sha1-teEHm1n7XhuidxwKmTvgYKWMmbo=" + "resolved" "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz" + "version" "2.0.3" + +"eventemitter3@^4.0.0": + "integrity" "sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==" + "resolved" "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz" + "version" "4.0.4" + +"execa@^1.0.0": + "integrity" "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==" + "resolved" "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz" + "version" "1.0.0" + dependencies: + "cross-spawn" "^6.0.0" + "get-stream" "^4.0.0" + "is-stream" "^1.1.0" + "npm-run-path" "^2.0.0" + "p-finally" "^1.0.0" + "signal-exit" "^3.0.0" + "strip-eof" "^1.0.0" + +"expand-brackets@^2.1.4": + "integrity" "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=" + "resolved" "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz" + "version" "2.1.4" + dependencies: + "debug" "^2.3.3" + "define-property" "^0.2.5" + "extend-shallow" "^2.0.1" + "posix-character-classes" "^0.1.0" + "regex-not" "^1.0.0" + "snapdragon" "^0.8.1" + "to-regex" "^3.0.1" + +"expand-tilde@^2.0.0", "expand-tilde@^2.0.2": + "integrity" "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=" + "resolved" "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz" + "version" "2.0.2" + dependencies: + "homedir-polyfill" "^1.0.1" + +"express@^4.17.1": + "integrity" "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==" + "resolved" "https://registry.npmjs.org/express/-/express-4.17.1.tgz" + "version" "4.17.1" + dependencies: + "accepts" "~1.3.7" + "array-flatten" "1.1.1" + "body-parser" "1.19.0" + "content-disposition" "0.5.3" + "content-type" "~1.0.4" + "cookie" "0.4.0" + "cookie-signature" "1.0.6" + "debug" "2.6.9" + "depd" "~1.1.2" + "encodeurl" "~1.0.2" + "escape-html" "~1.0.3" + "etag" "~1.8.1" + "finalhandler" "~1.1.2" + "fresh" "0.5.2" + "merge-descriptors" "1.0.1" + "methods" "~1.1.2" + "on-finished" "~2.3.0" + "parseurl" "~1.3.3" + "path-to-regexp" "0.1.7" + "proxy-addr" "~2.0.5" + "qs" "6.7.0" + "range-parser" "~1.2.1" + "safe-buffer" "5.1.2" + "send" "0.17.1" + "serve-static" "1.14.1" + "setprototypeof" "1.1.1" + "statuses" "~1.5.0" + "type-is" "~1.6.18" + "utils-merge" "1.0.1" + "vary" "~1.1.2" + +"extend-shallow@^2.0.1": + "integrity" "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=" + "resolved" "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz" + "version" "2.0.1" + dependencies: + "is-extendable" "^0.1.0" + +"extend-shallow@^3.0.0": + "integrity" "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=" + "resolved" "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz" + "version" "3.0.2" + dependencies: + "assign-symbols" "^1.0.0" + "is-extendable" "^1.0.1" + +"extend-shallow@^3.0.2": + "integrity" "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=" + "resolved" "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz" + "version" "3.0.2" + dependencies: + "assign-symbols" "^1.0.0" + "is-extendable" "^1.0.1" + +"extend@^3.0.0", "extend@^3.0.2", "extend@~3.0.2": + "integrity" "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" + "resolved" "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz" + "version" "3.0.2" + +"external-editor@^3.0.3": + "integrity" "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==" + "resolved" "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz" + "version" "3.1.0" + dependencies: + "chardet" "^0.7.0" + "iconv-lite" "^0.4.24" + "tmp" "^0.0.33" + +"extglob@^2.0.4": + "integrity" "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==" + "resolved" "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz" + "version" "2.0.4" + dependencies: + "array-unique" "^0.3.2" + "define-property" "^1.0.0" + "expand-brackets" "^2.1.4" + "extend-shallow" "^2.0.1" + "fragment-cache" "^0.2.1" + "regex-not" "^1.0.0" + "snapdragon" "^0.8.1" + "to-regex" "^3.0.1" + +"extract-zip@^1.6.5": + "integrity" "sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==" + "resolved" "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz" + "version" "1.7.0" + dependencies: + "concat-stream" "^1.6.2" + "debug" "^2.6.9" + "mkdirp" "^0.5.4" + "yauzl" "^2.10.0" + +"extsprintf@^1.2.0": + "integrity" "sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=" + "resolved" "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.0.tgz" + "version" "1.4.0" + +"extsprintf@1.3.0": + "integrity" "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" + "resolved" "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz" + "version" "1.3.0" + +"fast-deep-equal@^2.0.1": + "integrity" "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=" + "resolved" "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz" + "version" "2.0.1" + +"fast-deep-equal@^3.1.1": + "integrity" "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + "resolved" "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz" + "version" "3.1.3" + +"fast-diff@1.1.2": + "integrity" "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==" + "resolved" "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz" + "version" "1.1.2" + +"fast-diff@1.2.0": + "integrity" "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==" + "resolved" "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz" + "version" "1.2.0" + +"fast-json-stable-stringify@^2.0.0": + "integrity" "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" + "resolved" "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz" + "version" "2.1.0" + +"fast-safe-stringify@^2.0.4": + "integrity" "sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==" + "resolved" "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz" + "version" "2.0.7" + +"fastparse@^1.1.1": + "integrity" "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==" + "resolved" "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz" + "version" "1.1.2" + +"fastq@^1.6.0": + "integrity" "sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==" + "resolved" "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz" + "version" "1.11.0" + dependencies: + "reusify" "^1.0.4" + +"fd-slicer@~1.1.0": + "integrity" "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=" + "resolved" "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz" + "version" "1.1.0" + dependencies: + "pend" "~1.2.0" + +"fecha@^4.2.0": + "integrity" "sha512-aN3pcx/DSmtyoovUudctc8+6Hl4T+hI9GBBHLjA76jdZl7+b1sgh5g4k+u/GL3dTy1/pnYzKp69FpJ0OicE3Wg==" + "resolved" "https://registry.npmjs.org/fecha/-/fecha-4.2.0.tgz" + "version" "4.2.0" + +"figures@^3.0.0": + "integrity" "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==" + "resolved" "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz" + "version" "3.2.0" + dependencies: + "escape-string-regexp" "^1.0.5" + +"fill-range@^4.0.0": + "integrity" "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=" + "resolved" "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz" + "version" "4.0.0" + dependencies: + "extend-shallow" "^2.0.1" + "is-number" "^3.0.0" + "repeat-string" "^1.6.1" + "to-regex-range" "^2.1.0" + +"fill-range@^7.0.1": + "integrity" "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==" + "resolved" "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz" + "version" "7.0.1" + dependencies: + "to-regex-range" "^5.0.1" + +"finalhandler@~1.1.2": + "integrity" "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==" + "resolved" "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz" + "version" "1.1.2" + dependencies: + "debug" "2.6.9" + "encodeurl" "~1.0.2" + "escape-html" "~1.0.3" + "on-finished" "~2.3.0" + "parseurl" "~1.3.3" + "statuses" "~1.5.0" + "unpipe" "~1.0.0" + +"find-up@^1.0.0": + "integrity" "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=" + "resolved" "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz" + "version" "1.1.2" + dependencies: + "path-exists" "^2.0.0" + "pinkie-promise" "^2.0.0" + +"find-up@^3.0.0": + "integrity" "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==" + "resolved" "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz" + "version" "3.0.0" + dependencies: + "locate-path" "^3.0.0" + +"fn.name@1.x.x": + "integrity" "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==" + "resolved" "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz" + "version" "1.1.0" + +"follow-redirects@^1.10.0": + "integrity" "sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA==" + "resolved" "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.3.tgz" + "version" "1.13.3" + +"for-in@^1.0.2": + "integrity" "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=" + "resolved" "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz" + "version" "1.0.2" + +"foreach@^2.0.5": + "integrity" "sha1-C+4AUBiusmDQo6865ljdATbsG5k=" + "resolved" "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz" + "version" "2.0.5" + +"forever-agent@~0.6.1": + "integrity" "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" + "resolved" "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz" + "version" "0.6.1" + +"form-data@^2.3.1", "form-data@~2.3.2": + "integrity" "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==" + "resolved" "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz" + "version" "2.3.3" + dependencies: + "asynckit" "^0.4.0" + "combined-stream" "^1.0.6" + "mime-types" "^2.1.12" + +"formidable@^1.2.0": + "integrity" "sha512-Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg==" + "resolved" "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz" + "version" "1.2.1" + +"forwarded@~0.1.2": + "integrity" "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=" + "resolved" "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz" + "version" "0.1.2" + +"fragment-cache@^0.2.1": + "integrity" "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=" + "resolved" "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz" + "version" "0.2.1" + dependencies: + "map-cache" "^0.2.2" + +"frappe-charts@^2.0.0-rc13": + "integrity" "sha512-Bv7IfllIrjRbKWHn5b769dOSenqdBixAr6m5kurf8ZUOJSLOgK4HOXItJ7BA8n9PvviH9/k5DaloisjLM2Bm1w==" + "resolved" "https://registry.npmjs.org/frappe-charts/-/frappe-charts-2.0.0-rc13.tgz" + "version" "2.0.0-rc13" + +"frappe-datatable@^1.15.3": + "integrity" "sha512-tUE3pNbxCMX0HPKvwurLBPRAOAdS0gNo1+MpoyFSqXI7b7sp6/TCBRht6qu1Luw+VyIzBtXkJdnnqU+Uoy8iow==" + "resolved" "https://registry.npmjs.org/frappe-datatable/-/frappe-datatable-1.15.3.tgz" + "version" "1.15.3" + dependencies: + "hyperlist" "^1.0.0-beta" + "lodash" "^4.17.5" + "sortablejs" "^1.7.0" + +"frappe-gantt@^0.5.0": + "integrity" "sha512-RAskVuBmnTcPJXh87oVhYmnNGy/9lvZlLHGui8QFB8yRBuUjzpZoZfZ+hKmDtBDmWNrE2/LRta06W5WmhTzzWQ==" + "resolved" "https://registry.npmjs.org/frappe-gantt/-/frappe-gantt-0.5.0.tgz" + "version" "0.5.0" + +"fresh@0.5.2": + "integrity" "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" + "resolved" "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz" + "version" "0.5.2" + +"fs-constants@^1.0.0": + "integrity" "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" + "resolved" "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz" + "version" "1.0.0" + +"fs-extra@^1.0.0": + "integrity" "sha1-zTzl9+fLYUWIP8rjGR6Yd/hYeVA=" + "resolved" "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz" + "version" "1.0.0" + dependencies: + "graceful-fs" "^4.1.2" + "jsonfile" "^2.1.0" + "klaw" "^1.0.0" + +"fs-minipass@^2.0.0": + "integrity" "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==" + "resolved" "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz" + "version" "2.1.0" + dependencies: + "minipass" "^3.0.0" + +"fs.realpath@^1.0.0": + "integrity" "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + "resolved" "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" + "version" "1.0.0" + +"fstream@^1.0.0", "fstream@^1.0.12": + "integrity" "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==" + "resolved" "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz" + "version" "1.0.12" + dependencies: + "graceful-fs" "^4.1.2" + "inherits" "~2.0.0" + "mkdirp" ">=0.5 0" + "rimraf" "2" + +"function-bind@^1.1.1": + "integrity" "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + "resolved" "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz" + "version" "1.1.1" + +"fuse.js@^3.4.6": + "integrity" "sha512-H6aJY4UpLFwxj1+5nAvufom5b2BT2v45P1MkPvdGIK8fWjQx/7o6tTT1+ALV0yawQvbmvCF0ufl2et8eJ7v7Cg==" + "resolved" "https://registry.npmjs.org/fuse.js/-/fuse.js-3.4.6.tgz" + "version" "3.4.6" + +"gauge@~2.7.3": + "integrity" "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=" + "resolved" "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz" + "version" "2.7.4" + dependencies: + "aproba" "^1.0.3" + "console-control-strings" "^1.0.0" + "has-unicode" "^2.0.0" + "object-assign" "^4.1.0" + "signal-exit" "^3.0.0" + "string-width" "^1.0.1" + "strip-ansi" "^3.0.1" + "wide-align" "^1.1.0" + +"gaze@^1.0.0": + "integrity" "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==" + "resolved" "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz" + "version" "1.1.3" + dependencies: + "globule" "^1.0.0" + +"generic-names@^1.0.2", "generic-names@^1.0.3": + "integrity" "sha1-LXhqEhruUIh2eWk56OO/+DbCCRc=" + "resolved" "https://registry.npmjs.org/generic-names/-/generic-names-1.0.3.tgz" + "version" "1.0.3" + dependencies: + "loader-utils" "^0.2.16" + +"get-caller-file@^1.0.1": + "integrity" "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==" + "resolved" "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz" + "version" "1.0.3" + +"get-caller-file@^2.0.1": + "integrity" "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" + "resolved" "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz" + "version" "2.0.5" + +"get-pixels@^3.2.3": + "integrity" "sha512-6ar+8yPxRd1pskEcl2GSEu1La0+xYRjjnkby6AYiRDDwZ0tJbPQmHnSeH9fGLskT8kvR0OukVgtZLcsENF9YKQ==" + "resolved" "https://registry.npmjs.org/get-pixels/-/get-pixels-3.3.2.tgz" + "version" "3.3.2" + dependencies: + "data-uri-to-buffer" "0.0.3" + "jpeg-js" "^0.3.2" + "mime-types" "^2.0.1" + "ndarray" "^1.0.13" + "ndarray-pack" "^1.1.1" + "node-bitmap" "0.0.1" + "omggif" "^1.0.5" + "parse-data-uri" "^0.2.0" + "pngjs" "^3.3.3" + "request" "^2.44.0" + "through" "^2.3.4" + +"get-stdin@^4.0.1": + "integrity" "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=" + "resolved" "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz" + "version" "4.0.1" + +"get-stream@^4.0.0", "get-stream@^4.1.0": + "integrity" "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==" + "resolved" "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz" + "version" "4.1.0" + dependencies: + "pump" "^3.0.0" + +"get-stream@^5.1.0": + "integrity" "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==" + "resolved" "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz" + "version" "5.2.0" + dependencies: + "pump" "^3.0.0" + +"get-value@^2.0.3", "get-value@^2.0.6": + "integrity" "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=" + "resolved" "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz" + "version" "2.0.6" + +"getpass@^0.1.1": + "integrity" "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=" + "resolved" "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz" + "version" "0.1.7" + dependencies: + "assert-plus" "^1.0.0" + +"gl-mat2@^1.0.0": + "integrity" "sha1-FCUFcwpcL+Hp8l2ezj0NbMJxCjA=" + "resolved" "https://registry.npmjs.org/gl-mat2/-/gl-mat2-1.0.1.tgz" + "version" "1.0.1" + +"gl-vec2@^1.0.0": + "integrity" "sha512-YiqaAuNsheWmUV0Sa8k94kBB0D6RWjwZztyO+trEYS8KzJ6OQB/4686gdrf59wld4hHFIvaxynO3nRxpk1Ij/A==" + "resolved" "https://registry.npmjs.org/gl-vec2/-/gl-vec2-1.3.0.tgz" + "version" "1.3.0" + +"gl-vec3@^1.0.3": + "integrity" "sha512-jduKUqT0SGH02l8Yl+mV1yVsDfYgQAJyXGxkJQGyxPLHRiW25DwVIRPt6uvhrEMHftJfqhqKthRcyZqNEl9Xdw==" + "resolved" "https://registry.npmjs.org/gl-vec3/-/gl-vec3-1.1.3.tgz" + "version" "1.1.3" + +"glob@^7.0.0", "glob@^7.0.3", "glob@^7.1.2", "glob@^7.1.3", "glob@^7.1.6", "glob@~7.1.1": + "integrity" "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==" + "resolved" "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz" + "version" "7.1.6" + dependencies: + "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" + +"glob@7.1.2": + "integrity" "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==" + "resolved" "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz" + "version" "7.1.2" + dependencies: + "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" + +"global-agent@^2.1.12": + "integrity" "sha512-caAljRMS/qcDo69X9BfkgrihGUgGx44Fb4QQToNQjsiWh+YlQ66uqYVAdA8Olqit+5Ng0nkz09je3ZzANMZcjg==" + "resolved" "https://registry.npmjs.org/global-agent/-/global-agent-2.1.12.tgz" + "version" "2.1.12" + dependencies: + "boolean" "^3.0.1" + "core-js" "^3.6.5" + "es6-error" "^4.1.1" + "matcher" "^3.0.0" + "roarr" "^2.15.3" + "semver" "^7.3.2" + "serialize-error" "^7.0.1" + +"global-dirs@^2.0.1": + "integrity" "sha512-5HqUqdhkEovj2Of/ms3IeS/EekcO54ytHRLV4PEY2rhRwrHXLQjeVEES0Lhka0xwNDtGYn58wyC4s5+MHsOO6A==" + "resolved" "https://registry.npmjs.org/global-dirs/-/global-dirs-2.0.1.tgz" + "version" "2.0.1" + dependencies: + "ini" "^1.3.5" + +"global-modules@^1.0.0": + "integrity" "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==" + "resolved" "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz" + "version" "1.0.0" + dependencies: + "global-prefix" "^1.0.1" + "is-windows" "^1.0.1" + "resolve-dir" "^1.0.0" + +"global-prefix@^1.0.1": + "integrity" "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=" + "resolved" "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz" + "version" "1.0.2" + dependencies: + "expand-tilde" "^2.0.2" + "homedir-polyfill" "^1.0.1" + "ini" "^1.3.4" + "is-windows" "^1.0.1" + "which" "^1.2.14" + +"globalthis@^1.0.1": + "integrity" "sha512-ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ==" + "resolved" "https://registry.npmjs.org/globalthis/-/globalthis-1.0.2.tgz" + "version" "1.0.2" + dependencies: + "define-properties" "^1.1.3" + +"globule@^1.0.0": + "integrity" "sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA==" + "resolved" "https://registry.npmjs.org/globule/-/globule-1.3.2.tgz" + "version" "1.3.2" + dependencies: + "glob" "~7.1.1" + "lodash" "~4.17.10" + "minimatch" "~3.0.2" + +"got@^9.6.0": + "integrity" "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==" + "resolved" "https://registry.npmjs.org/got/-/got-9.6.0.tgz" + "version" "9.6.0" + dependencies: + "@sindresorhus/is" "^0.14.0" + "@szmarczak/http-timer" "^1.1.2" + "cacheable-request" "^6.0.0" + "decompress-response" "^3.3.0" + "duplexer3" "^0.1.4" + "get-stream" "^4.1.0" + "lowercase-keys" "^1.0.1" + "mimic-response" "^1.0.1" + "p-cancelable" "^1.0.0" + "to-readable-stream" "^1.0.0" + "url-parse-lax" "^3.0.0" + +"got@11.4.0": + "integrity" "sha512-XysJZuZNVpaQ37Oo2LV90MIkPeYITehyy1A0QzO1JwOXm8EWuEf9eeGk2XuHePvLEGnm9AVOI37bHwD6KYyBtg==" + "resolved" "https://registry.npmjs.org/got/-/got-11.4.0.tgz" + "version" "11.4.0" dependencies: "@sindresorhus/is" "^2.1.1" "@szmarczak/http-timer" "^4.0.5" "@types/cacheable-request" "^6.0.1" "@types/responselike" "^1.0.0" - cacheable-lookup "^5.0.3" - cacheable-request "^7.0.1" - decompress-response "^6.0.0" - http2-wrapper "^1.0.0-beta.4.5" - lowercase-keys "^2.0.0" - p-cancelable "^2.0.0" - responselike "^2.0.0" - -got@^9.6.0: - version "9.6.0" - resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" - integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q== - dependencies: - "@sindresorhus/is" "^0.14.0" - "@szmarczak/http-timer" "^1.1.2" - cacheable-request "^6.0.0" - decompress-response "^3.3.0" - duplexer3 "^0.1.4" - get-stream "^4.1.0" - lowercase-keys "^1.0.1" - mimic-response "^1.0.1" - p-cancelable "^1.0.0" - to-readable-stream "^1.0.0" - url-parse-lax "^3.0.0" - -graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9: - version "4.2.4" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" - integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== - -graphlib@^2.1.8: - version "2.1.8" - resolved "https://registry.yarnpkg.com/graphlib/-/graphlib-2.1.8.tgz#5761d414737870084c92ec7b5dbcb0592c9d35da" - integrity sha512-jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A== - dependencies: - lodash "^4.17.15" - -growl@1.10.5: - version "1.10.5" - resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e" - integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA== - -gunzip-maybe@^1.4.2: - version "1.4.2" - resolved "https://registry.yarnpkg.com/gunzip-maybe/-/gunzip-maybe-1.4.2.tgz#b913564ae3be0eda6f3de36464837a9cd94b98ac" - integrity sha512-4haO1M4mLO91PW57BMsDFf75UmwoRX0GkdD+Faw+Lr+r/OZrOCS0pIBwOL1xCKQqnQzbNFGgK2V2CpBUPeFNTw== - dependencies: - browserify-zlib "^0.1.4" - is-deflate "^1.0.0" - is-gzip "^1.0.0" - peek-stream "^1.1.0" - pumpify "^1.3.3" - through2 "^2.0.3" - -har-schema@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" - integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= - -har-validator@~5.1.0, har-validator@~5.1.3: - version "5.1.5" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd" - integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w== - dependencies: - ajv "^6.12.3" - har-schema "^2.0.0" - -has-ansi@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" - integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= - dependencies: - ansi-regex "^2.0.0" - -has-binary2@~1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d" - integrity sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw== - dependencies: - isarray "2.0.1" - -has-cors@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39" - integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk= - -has-flag@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa" - integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo= - -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= - -has-flag@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" - integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== - -has-glob@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-glob/-/has-glob-1.0.0.tgz#9aaa9eedbffb1ba3990a7b0010fb678ee0081207" - integrity sha1-mqqe7b/7G6OZCnsAEPtnjuAIEgc= - dependencies: - is-glob "^3.0.0" - -has-symbols@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44" - integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q= - -has-symbols@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8" - integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg== - -has-unicode@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" - integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= - -has-value@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" - integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8= - dependencies: - get-value "^2.0.3" - has-values "^0.1.4" - isobject "^2.0.0" - -has-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177" - integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc= - dependencies: - get-value "^2.0.6" - has-values "^1.0.0" - isobject "^3.0.0" - -has-values@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" - integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E= - -has-values@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f" - integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8= - dependencies: - is-number "^3.0.0" - kind-of "^4.0.0" - -has-yarn@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" - integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw== - -has@^1.0.0, has@^1.0.1, has@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" - integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== - dependencies: - function-bind "^1.1.1" - -hash-sum@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-1.0.2.tgz#33b40777754c6432573c120cc3808bbd10d47f04" - integrity sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ= - -hasha@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/hasha/-/hasha-2.2.0.tgz#78d7cbfc1e6d66303fe79837365984517b2f6ee1" - integrity sha1-eNfL/B5tZjA/55g3NlmEUXsvbuE= - dependencies: - is-stream "^1.0.1" - pinkie-promise "^2.0.0" - -hcl-to-json@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/hcl-to-json/-/hcl-to-json-0.1.1.tgz#39674aa2a5a4d2b4c2b6762c8196af4af4f12903" - integrity sha512-sj1RPsdgX/ilBGZGnyjbSHQbRe20hyA6VDXYBGJedHSCdwSWkr/7tr85N7FGeM7KvBjIQX7Gl897bo0Ug73Z/A== - dependencies: - debug "^3.0.1" - lodash.get "^4.4.2" - lodash.set "^4.3.2" - -he@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd" - integrity sha1-k0EP0hsAlzUVH4howvJx80J+I/0= - -he@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" - integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== - -hex-color-regex@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e" - integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ== - -highlight.js@^10.4.1: - version "10.4.1" - resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.4.1.tgz#d48fbcf4a9971c4361b3f95f302747afe19dbad0" - integrity sha512-yR5lWvNz7c85OhVAEAeFhVCc/GV4C30Fjzc/rCP0aCWzc1UUOPUk55dK/qdwTZHBvMZo+eZ2jpk62ndX/xMFlg== - -homedir-polyfill@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8" - integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA== - dependencies: - parse-passwd "^1.0.0" - -hosted-git-info@^2.1.4: - version "2.8.8" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488" - integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg== - -hosted-git-info@^3.0.4: - version "3.0.5" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.5.tgz#bea87905ef7317442e8df3087faa3c842397df03" - integrity sha512-i4dpK6xj9BIpVOTboXIlKG9+8HMKggcrMX7WA24xZtKwX0TPelq/rbaS5rCKeNX8sJXZJGdSxpnEGtta+wismQ== - dependencies: - lru-cache "^6.0.0" - -hosted-git-info@^3.0.7: - version "3.0.7" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.7.tgz#a30727385ea85acfcee94e0aad9e368c792e036c" - integrity sha512-fWqc0IcuXs+BmE9orLDyVykAG9GJtGLGuZAAqgcckPgv5xad4AcXGIv8galtQvlwutxSlaMcdw7BUtq2EIvqCQ== - dependencies: - lru-cache "^6.0.0" - -hsl-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/hsl-regex/-/hsl-regex-1.0.0.tgz#d49330c789ed819e276a4c0d272dffa30b18fe6e" - integrity sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4= - -hsla-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/hsla-regex/-/hsla-regex-1.0.0.tgz#c1ce7a3168c8c6614033a4b5f7877f3b225f9c38" - integrity sha1-wc56MWjIxmFAM6S194d/OyJfnDg= - -html-comment-regex@^1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.2.tgz#97d4688aeb5c81886a364faa0cad1dda14d433a7" - integrity sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ== - -http-cache-semantics@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" - integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== - -http-errors@1.7.2: - version "1.7.2" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" - integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg== - dependencies: - depd "~1.1.2" - inherits "2.0.3" - setprototypeof "1.1.1" - statuses ">= 1.5.0 < 2" - toidentifier "1.0.0" - -http-errors@~1.7.2: - version "1.7.3" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" - integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw== - dependencies: - depd "~1.1.2" - inherits "2.0.4" - setprototypeof "1.1.1" - statuses ">= 1.5.0 < 2" - toidentifier "1.0.0" - -http-signature@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" - integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE= - dependencies: - assert-plus "^1.0.0" - jsprim "^1.2.2" - sshpk "^1.7.0" - -http2-wrapper@^1.0.0-beta.4.5: - version "1.0.0-beta.5.2" - resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.0-beta.5.2.tgz#8b923deb90144aea65cf834b016a340fc98556f3" - integrity sha512-xYz9goEyBnC8XwXDTuC/MZ6t+MrKVQZOk4s7+PaDkwIsQd8IwqvM+0M6bA/2lvG8GHXcPdf+MejTUeO2LCPCeQ== - dependencies: - quick-lru "^5.1.1" - resolve-alpn "^1.0.0" - -hyperlist@^1.0.0-beta: - version "1.0.0-beta" - resolved "https://registry.yarnpkg.com/hyperlist/-/hyperlist-1.0.0-beta.tgz#2cbbd77f4498c2ecc290b7f3c6745b3f0288247e" - integrity sha1-LLvXf0SYwuzCkLfzxnRbPwKIJH4= - -iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4: - version "0.4.24" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" - integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== - dependencies: - safer-buffer ">= 2.1.2 < 3" - -icss-replace-symbols@1.1.0, icss-replace-symbols@^1.0.2, icss-replace-symbols@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded" - integrity sha1-Bupvg2ead0njhs/h/oEq5dsiPe0= - -ieee754@^1.1.4: - version "1.1.13" - resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84" - integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg== - -ignore@^5.1.8: - version "5.1.8" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57" - integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw== - -image-size@~0.5.0: - version "0.5.5" - resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c" - integrity sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w= - -immediate@~3.0.5: - version "3.0.6" - resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b" - integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps= - -import-cwd@^2.0.0, import-cwd@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9" - integrity sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk= - dependencies: - import-from "^2.1.0" - -import-fresh@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546" - integrity sha1-2BNVwVYS04bGH53dOSLUMEgipUY= - dependencies: - caller-path "^2.0.0" - resolve-from "^3.0.0" - -import-from@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1" - integrity sha1-M1238qev/VOqpHHUuAId7ja387E= - dependencies: - resolve-from "^3.0.0" - -import-lazy@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" - integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM= - -imurmurhash@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" - integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= - -in-publish@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.1.tgz#948b1a535c8030561cea522f73f78f4be357e00c" - integrity sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ== - -indent-string@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80" - integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA= - dependencies: - repeating "^2.0.0" - -indent-string@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" - integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== - -indexes-of@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607" - integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc= - -indexof@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d" - integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10= - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.0, inherits@~2.0.3: - version "2.0.4" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" - integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== - -inherits@2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= - -ini@^1.3.4, ini@^1.3.5, ini@~1.3.0: - version "1.3.8" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" - integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== - -invert-kv@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02" - integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA== - -iota-array@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/iota-array/-/iota-array-1.0.0.tgz#81ef57fe5d05814cd58c2483632a99c30a0e8087" - integrity sha1-ge9X/l0FgUzVjCSDYyqZwwoOgIc= - -ipaddr.js@1.9.1: - version "1.9.1" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" - integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== - -is-absolute-url@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6" - integrity sha1-UFMN+4T8yap9vnhS6Do3uTufKqY= - -is-accessor-descriptor@^0.1.6: - version "0.1.6" - resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" - integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY= - dependencies: - kind-of "^3.0.2" - -is-accessor-descriptor@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656" - integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ== - dependencies: - kind-of "^6.0.0" - -is-arguments@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz#3faf966c7cba0ff437fb31f6250082fcf0448cf3" - integrity sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA== - -is-arrayish@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" - integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= - -is-arrayish@^0.3.1: - version "0.3.2" - resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03" - integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== - -is-bigint@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.0.tgz#73da8c33208d00f130e9b5e15d23eac9215601c4" - integrity sha512-t5mGUXC/xRheCK431ylNiSkGGpBp8bHENBcENTkDT6ppwPzEVxNGZRvgvmOEfbWkFhA7D2GEuE2mmQTr78sl2g== - -is-boolean-object@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.1.tgz#10edc0900dd127697a92f6f9807c7617d68ac48e" - integrity sha512-TqZuVwa/sppcrhUCAYkGBk7w0yxfQQnxq28fjkO53tnK9FQXmdwz2JS5+GjsWQ6RByES1K40nI+yDic5c9/aAQ== - -is-buffer@^1.0.2, is-buffer@^1.1.5: - version "1.1.6" - resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" - integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== - -is-callable@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75" - integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA== - -is-callable@^1.1.5: - version "1.2.0" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.0.tgz#83336560b54a38e35e3a2df7afd0454d691468bb" - integrity sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw== - -is-ci@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" - integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w== - dependencies: - ci-info "^2.0.0" - -is-color-stop@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz#cfff471aee4dd5c9e158598fbe12967b5cdad345" - integrity sha1-z/9HGu5N1cnhWFmPvhKWe1za00U= - dependencies: - css-color-names "^0.0.4" - hex-color-regex "^1.1.0" - hsl-regex "^1.0.0" - hsla-regex "^1.0.0" - rgb-regex "^1.0.1" - rgba-regex "^1.0.0" - -is-data-descriptor@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" - integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y= - dependencies: - kind-of "^3.0.2" - -is-data-descriptor@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7" - integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ== - dependencies: - kind-of "^6.0.0" - -is-date-object@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16" - integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY= - -is-date-object@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e" - integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g== - -is-deflate@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-deflate/-/is-deflate-1.0.0.tgz#c862901c3c161fb09dac7cdc7e784f80e98f2f14" - integrity sha1-yGKQHDwWH7CdrHzcfnhPgOmPLxQ= - -is-descriptor@^0.1.0: - version "0.1.6" - resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" - integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg== - dependencies: - is-accessor-descriptor "^0.1.6" - is-data-descriptor "^0.1.4" - kind-of "^5.0.0" - -is-descriptor@^1.0.0, is-descriptor@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec" - integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg== - dependencies: - is-accessor-descriptor "^1.0.0" - is-data-descriptor "^1.0.0" - kind-of "^6.0.2" - -is-directory@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1" - integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE= - -is-docker@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.0.0.tgz#2cb0df0e75e2d064fe1864c37cdeacb7b2dcf25b" - integrity sha512-pJEdRugimx4fBMra5z2/5iRdZ63OhYV0vr0Dwm5+xtW4D1FvRkB8hamMIhnWfyJeDdyr/aa7BDyNbtG38VxgoQ== - -is-extendable@^0.1.0, is-extendable@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" - integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= - -is-extendable@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" - integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA== - dependencies: - is-plain-object "^2.0.4" - -is-extglob@^2.1.0, is-extglob@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= - -is-finite@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3" - integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w== - -is-fullwidth-code-point@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" - integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= - dependencies: - number-is-nan "^1.0.0" - -is-fullwidth-code-point@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" - integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= - -is-fullwidth-code-point@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" - integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== - -is-glob@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" - integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo= - dependencies: - is-extglob "^2.1.0" - -is-glob@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" - integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== - dependencies: - is-extglob "^2.1.1" - -is-gzip@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-gzip/-/is-gzip-1.0.0.tgz#6ca8b07b99c77998025900e555ced8ed80879a83" - integrity sha1-bKiwe5nHeZgCWQDlVc7Y7YCHmoM= - -is-installed-globally@^0.3.1: - version "0.3.2" - resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.3.2.tgz#fd3efa79ee670d1187233182d5b0a1dd00313141" - integrity sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g== - dependencies: - global-dirs "^2.0.1" - is-path-inside "^3.0.1" - -is-interactive@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e" - integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w== - -is-map@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.1.tgz#520dafc4307bb8ebc33b813de5ce7c9400d644a1" - integrity sha512-T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw== - -is-module@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591" - integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE= - -is-npm@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-4.0.0.tgz#c90dd8380696df87a7a6d823c20d0b12bbe3c84d" - integrity sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig== - -is-number-object@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz#36ac95e741cf18b283fc1ddf5e83da798e3ec197" - integrity sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw== - -is-number@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" - integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU= - dependencies: - kind-of "^3.0.2" - -is-number@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" - integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== - -is-obj@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" - integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8= - -is-obj@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" - integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== - -is-path-inside@^3.0.1: - version "3.0.2" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.2.tgz#f5220fc82a3e233757291dddc9c5877f2a1f3017" - integrity sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg== - -is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" - integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== - dependencies: - isobject "^3.0.1" - -is-regex@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491" - integrity sha1-VRdIm1RwkbCTDglWVM7SXul+lJE= - dependencies: - has "^1.0.1" - -is-regex@^1.0.5: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.0.tgz#ece38e389e490df0dc21caea2bd596f987f767ff" - integrity sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw== - dependencies: - has-symbols "^1.0.1" - -is-resolvable@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88" - integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg== - -is-set@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.1.tgz#d1604afdab1724986d30091575f54945da7e5f43" - integrity sha512-eJEzOtVyenDs1TMzSQ3kU3K+E0GUS9sno+F0OBT97xsgcJsF9nXMBtkT9/kut5JEpM7oL7X/0qxR17K3mcwIAA== - -is-stream@^1.0.1, is-stream@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" - integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= - -is-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3" - integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== - -is-string@^1.0.4, is-string@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6" - integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ== - -is-svg@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-3.0.0.tgz#9321dbd29c212e5ca99c4fa9794c714bcafa2f75" - integrity sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ== - dependencies: - html-comment-regex "^1.1.0" - -is-symbol@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38" - integrity sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw== - dependencies: - has-symbols "^1.0.0" - -is-typed-array@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.3.tgz#a4ff5a5e672e1a55f99c7f54e59597af5c1df04d" - integrity sha512-BSYUBOK/HJibQ30wWkWold5txYwMUXQct9YHAQJr8fSwvZoiglcqB0pd7vEN23+Tsi9IUEjztdOSzl4qLVYGTQ== - dependencies: - available-typed-arrays "^1.0.0" - es-abstract "^1.17.4" - foreach "^2.0.5" - has-symbols "^1.0.1" - -is-typedarray@^1.0.0, is-typedarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" - integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= - -is-unicode-supported@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7" - integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw== - -is-utf8@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" - integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI= - -is-valid-glob@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz#29bf3eff701be2d4d315dbacc39bc39fe8f601aa" - integrity sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao= - -is-weakmap@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2" - integrity sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA== - -is-weakset@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.1.tgz#e9a0af88dbd751589f5e50d80f4c98b780884f83" - integrity sha512-pi4vhbhVHGLxohUw7PhGsueT4vRGFoXhP7+RGN0jKIv9+8PWYCQTqtADngrxOm2g46hoH0+g8uZZBzMrvVGDmw== - -is-windows@^1.0.1, is-windows@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" - integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== - -is-wsl@^2.1.1: - version "2.2.0" - resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" - integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== - dependencies: - is-docker "^2.0.0" - -is-yarn-global@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232" - integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw== - -isarray@1.0.0, isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= - -isarray@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e" - integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4= - -isarray@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723" - integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw== - -isexe@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= - -isobject@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" - integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk= - dependencies: - isarray "1.0.0" - -isobject@^3.0.0, isobject@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" - integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= - -isstream@~0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" - integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= - -jest-worker@^24.0.0: - version "24.6.0" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.6.0.tgz#7f81ceae34b7cde0c9827a6980c35b7cdc0161b3" - integrity sha512-jDwgW5W9qGNvpI1tNnvajh0a5IE/PuGLFmHk6aR/BZFz8tSgGw17GsDPXAJ6p91IvYDjOw8GpFbvvZGAK+DPQQ== - dependencies: - merge-stream "^1.0.1" - supports-color "^6.1.0" - -jpeg-js@^0.3.2: - version "0.3.6" - resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.3.6.tgz#c40382aac9506e7d1f2d856eb02f6c7b2a98b37c" - integrity sha512-MUj2XlMB8kpe+8DJUGH/3UJm4XpI8XEgZQ+CiHDeyrGoKPdW/8FJv6ku+3UiYm5Fz3CWaL+iXmD8Q4Ap6aC1Jw== - -"jquery@>=2.0.0 <4.0.0": - version "3.4.1" - resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2" - integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw== - -js-base64@^2.1.8: - version "2.6.4" - resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4" - integrity sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ== - -js-base64@^2.1.9: - version "2.5.1" - resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.1.tgz#1efa39ef2c5f7980bb1784ade4a8af2de3291121" - integrity sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw== - -js-sha256@^0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/js-sha256/-/js-sha256-0.9.0.tgz#0b89ac166583e91ef9123644bd3c5334ce9d0966" - integrity sha512-sga3MHh9sgQN2+pJ9VYZ+1LPwXOxuBJBA5nrR5/ofPfuiJBE2hnjsaN8se8JznOmGLN2p49Pe5U/ttafcs/apA== - -js-tokens@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" - integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== - -js-yaml@^3.12.0, js-yaml@^3.13.1, js-yaml@^3.9.0: - version "3.14.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482" - integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A== - dependencies: - argparse "^1.0.7" - esprima "^4.0.0" - -jsbarcode@^3.9.0: - version "3.11.0" - resolved "https://registry.yarnpkg.com/jsbarcode/-/jsbarcode-3.11.0.tgz#20623e008b101ef45d0cce9c8022cdf49be28547" - integrity sha512-/ozCd7wsa+VIHo9sUc03HneVEQrH7cVWfJolUT/WOW1m8mJ2e3iYZje6C9X3LFHdczlesqFHRpxLtbVsNtjyow== - -jsbn@~0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" - integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= - -jsesc@~0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" - integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= - -json-buffer@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" - integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg= - -json-buffer@3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13" - integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ== - -json-parse-better-errors@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" - integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== - -json-schema-traverse@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" - integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== - -json-schema@0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" - integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM= - -json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" - integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= - -json5@^0.5.0: - version "0.5.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" - integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE= - -jsonfile@^2.1.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8" - integrity sha1-NzaitCi4e72gzIO1P6PWM6NcKug= + "cacheable-lookup" "^5.0.3" + "cacheable-request" "^7.0.1" + "decompress-response" "^6.0.0" + "http2-wrapper" "^1.0.0-beta.4.5" + "lowercase-keys" "^2.0.0" + "p-cancelable" "^2.0.0" + "responselike" "^2.0.0" + +"graceful-fs@^4.1.2", "graceful-fs@^4.1.6", "graceful-fs@^4.1.9": + "integrity" "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==" + "resolved" "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz" + "version" "4.2.4" + +"graphlib@^2.1.8": + "integrity" "sha512-jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A==" + "resolved" "https://registry.npmjs.org/graphlib/-/graphlib-2.1.8.tgz" + "version" "2.1.8" + dependencies: + "lodash" "^4.17.15" + +"growl@1.10.5": + "integrity" "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==" + "resolved" "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz" + "version" "1.10.5" + +"gunzip-maybe@^1.4.2": + "integrity" "sha512-4haO1M4mLO91PW57BMsDFf75UmwoRX0GkdD+Faw+Lr+r/OZrOCS0pIBwOL1xCKQqnQzbNFGgK2V2CpBUPeFNTw==" + "resolved" "https://registry.npmjs.org/gunzip-maybe/-/gunzip-maybe-1.4.2.tgz" + "version" "1.4.2" + dependencies: + "browserify-zlib" "^0.1.4" + "is-deflate" "^1.0.0" + "is-gzip" "^1.0.0" + "peek-stream" "^1.1.0" + "pumpify" "^1.3.3" + "through2" "^2.0.3" + +"har-schema@^2.0.0": + "integrity" "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=" + "resolved" "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz" + "version" "2.0.0" + +"har-validator@~5.1.0", "har-validator@~5.1.3": + "integrity" "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==" + "resolved" "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz" + "version" "5.1.5" + dependencies: + "ajv" "^6.12.3" + "har-schema" "^2.0.0" + +"has-ansi@^2.0.0": + "integrity" "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=" + "resolved" "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz" + "version" "2.0.0" + dependencies: + "ansi-regex" "^2.0.0" + +"has-binary2@~1.0.2": + "integrity" "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==" + "resolved" "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz" + "version" "1.0.3" + dependencies: + "isarray" "2.0.1" + +"has-cors@1.1.0": + "integrity" "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=" + "resolved" "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz" + "version" "1.1.0" + +"has-flag@^1.0.0": + "integrity" "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=" + "resolved" "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz" + "version" "1.0.0" + +"has-flag@^3.0.0": + "integrity" "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" + "resolved" "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz" + "version" "3.0.0" + +"has-flag@^4.0.0": + "integrity" "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + "resolved" "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz" + "version" "4.0.0" + +"has-glob@^1.0.0": + "integrity" "sha1-mqqe7b/7G6OZCnsAEPtnjuAIEgc=" + "resolved" "https://registry.npmjs.org/has-glob/-/has-glob-1.0.0.tgz" + "version" "1.0.0" + dependencies: + "is-glob" "^3.0.0" + +"has-symbols@^1.0.0": + "integrity" "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=" + "resolved" "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz" + "version" "1.0.0" + +"has-symbols@^1.0.1": + "integrity" "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==" + "resolved" "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz" + "version" "1.0.1" + +"has-unicode@^2.0.0": + "integrity" "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" + "resolved" "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz" + "version" "2.0.1" + +"has-value@^0.3.1": + "integrity" "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=" + "resolved" "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz" + "version" "0.3.1" + dependencies: + "get-value" "^2.0.3" + "has-values" "^0.1.4" + "isobject" "^2.0.0" + +"has-value@^1.0.0": + "integrity" "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=" + "resolved" "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz" + "version" "1.0.0" + dependencies: + "get-value" "^2.0.6" + "has-values" "^1.0.0" + "isobject" "^3.0.0" + +"has-values@^0.1.4": + "integrity" "sha1-bWHeldkd/Km5oCCJrThL/49it3E=" + "resolved" "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz" + "version" "0.1.4" + +"has-values@^1.0.0": + "integrity" "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=" + "resolved" "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz" + "version" "1.0.0" + dependencies: + "is-number" "^3.0.0" + "kind-of" "^4.0.0" + +"has-yarn@^2.1.0": + "integrity" "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==" + "resolved" "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz" + "version" "2.1.0" + +"has@^1.0.0", "has@^1.0.1", "has@^1.0.3": + "integrity" "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==" + "resolved" "https://registry.npmjs.org/has/-/has-1.0.3.tgz" + "version" "1.0.3" + dependencies: + "function-bind" "^1.1.1" + +"hash-sum@^1.0.2": + "integrity" "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=" + "resolved" "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz" + "version" "1.0.2" + +"hasha@^2.2.0": + "integrity" "sha1-eNfL/B5tZjA/55g3NlmEUXsvbuE=" + "resolved" "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz" + "version" "2.2.0" + dependencies: + "is-stream" "^1.0.1" + "pinkie-promise" "^2.0.0" + +"hcl-to-json@^0.1.1": + "integrity" "sha512-sj1RPsdgX/ilBGZGnyjbSHQbRe20hyA6VDXYBGJedHSCdwSWkr/7tr85N7FGeM7KvBjIQX7Gl897bo0Ug73Z/A==" + "resolved" "https://registry.npmjs.org/hcl-to-json/-/hcl-to-json-0.1.1.tgz" + "version" "0.1.1" + dependencies: + "debug" "^3.0.1" + "lodash.get" "^4.4.2" + "lodash.set" "^4.3.2" + +"he@^1.1.0": + "integrity" "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==" + "resolved" "https://registry.npmjs.org/he/-/he-1.2.0.tgz" + "version" "1.2.0" + +"he@1.1.1": + "integrity" "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=" + "resolved" "https://registry.npmjs.org/he/-/he-1.1.1.tgz" + "version" "1.1.1" + +"hex-color-regex@^1.1.0": + "integrity" "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==" + "resolved" "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz" + "version" "1.1.0" + +"highlight.js@^10.4.1": + "integrity" "sha512-yR5lWvNz7c85OhVAEAeFhVCc/GV4C30Fjzc/rCP0aCWzc1UUOPUk55dK/qdwTZHBvMZo+eZ2jpk62ndX/xMFlg==" + "resolved" "https://registry.npmjs.org/highlight.js/-/highlight.js-10.4.1.tgz" + "version" "10.4.1" + +"homedir-polyfill@^1.0.1": + "integrity" "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==" + "resolved" "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz" + "version" "1.0.3" + dependencies: + "parse-passwd" "^1.0.0" + +"hosted-git-info@^2.1.4": + "integrity" "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==" + "resolved" "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz" + "version" "2.8.8" + +"hosted-git-info@^3.0.4": + "integrity" "sha512-i4dpK6xj9BIpVOTboXIlKG9+8HMKggcrMX7WA24xZtKwX0TPelq/rbaS5rCKeNX8sJXZJGdSxpnEGtta+wismQ==" + "resolved" "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.5.tgz" + "version" "3.0.5" + dependencies: + "lru-cache" "^6.0.0" + +"hosted-git-info@^3.0.7": + "integrity" "sha512-fWqc0IcuXs+BmE9orLDyVykAG9GJtGLGuZAAqgcckPgv5xad4AcXGIv8galtQvlwutxSlaMcdw7BUtq2EIvqCQ==" + "resolved" "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.7.tgz" + "version" "3.0.7" + dependencies: + "lru-cache" "^6.0.0" + +"hsl-regex@^1.0.0": + "integrity" "sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4=" + "resolved" "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz" + "version" "1.0.0" + +"hsla-regex@^1.0.0": + "integrity" "sha1-wc56MWjIxmFAM6S194d/OyJfnDg=" + "resolved" "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz" + "version" "1.0.0" + +"html-comment-regex@^1.1.0": + "integrity" "sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==" + "resolved" "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz" + "version" "1.1.2" + +"http-cache-semantics@^4.0.0": + "integrity" "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==" + "resolved" "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz" + "version" "4.1.0" + +"http-errors@~1.7.2": + "integrity" "sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==" + "resolved" "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz" + "version" "1.7.3" + dependencies: + "depd" "~1.1.2" + "inherits" "2.0.4" + "setprototypeof" "1.1.1" + "statuses" ">= 1.5.0 < 2" + "toidentifier" "1.0.0" + +"http-errors@1.7.2": + "integrity" "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==" + "resolved" "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz" + "version" "1.7.2" + dependencies: + "depd" "~1.1.2" + "inherits" "2.0.3" + "setprototypeof" "1.1.1" + "statuses" ">= 1.5.0 < 2" + "toidentifier" "1.0.0" + +"http-signature@~1.2.0": + "integrity" "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=" + "resolved" "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz" + "version" "1.2.0" + dependencies: + "assert-plus" "^1.0.0" + "jsprim" "^1.2.2" + "sshpk" "^1.7.0" + +"http2-wrapper@^1.0.0-beta.4.5": + "integrity" "sha512-xYz9goEyBnC8XwXDTuC/MZ6t+MrKVQZOk4s7+PaDkwIsQd8IwqvM+0M6bA/2lvG8GHXcPdf+MejTUeO2LCPCeQ==" + "resolved" "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.0-beta.5.2.tgz" + "version" "1.0.0-beta.5.2" + dependencies: + "quick-lru" "^5.1.1" + "resolve-alpn" "^1.0.0" + +"hyperlist@^1.0.0-beta": + "integrity" "sha1-LLvXf0SYwuzCkLfzxnRbPwKIJH4=" + "resolved" "https://registry.npmjs.org/hyperlist/-/hyperlist-1.0.0-beta.tgz" + "version" "1.0.0-beta" + +"iconv-lite@^0.4.24", "iconv-lite@^0.4.4", "iconv-lite@0.4.24": + "integrity" "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==" + "resolved" "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz" + "version" "0.4.24" + dependencies: + "safer-buffer" ">= 2.1.2 < 3" + +"icss-replace-symbols@^1.0.2", "icss-replace-symbols@^1.1.0", "icss-replace-symbols@1.1.0": + "integrity" "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=" + "resolved" "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz" + "version" "1.1.0" + +"ieee754@^1.1.4": + "integrity" "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==" + "resolved" "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz" + "version" "1.1.13" + +"ignore@^5.1.8": + "integrity" "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==" + "resolved" "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz" + "version" "5.1.8" + +"image-size@~0.5.0": + "integrity" "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=" + "resolved" "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz" + "version" "0.5.5" + +"immediate@~3.0.5": + "integrity" "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=" + "resolved" "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz" + "version" "3.0.6" + +"import-cwd@^2.0.0", "import-cwd@^2.1.0": + "integrity" "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=" + "resolved" "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz" + "version" "2.1.0" + dependencies: + "import-from" "^2.1.0" + +"import-fresh@^2.0.0": + "integrity" "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=" + "resolved" "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz" + "version" "2.0.0" + dependencies: + "caller-path" "^2.0.0" + "resolve-from" "^3.0.0" + +"import-from@^2.1.0": + "integrity" "sha1-M1238qev/VOqpHHUuAId7ja387E=" + "resolved" "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz" + "version" "2.1.0" + dependencies: + "resolve-from" "^3.0.0" + +"import-lazy@^2.1.0": + "integrity" "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=" + "resolved" "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz" + "version" "2.1.0" + +"imurmurhash@^0.1.4": + "integrity" "sha1-khi5srkoojixPcT7a21XbyMUU+o=" + "resolved" "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz" + "version" "0.1.4" + +"in-publish@^2.0.0": + "integrity" "sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ==" + "resolved" "https://registry.npmjs.org/in-publish/-/in-publish-2.0.1.tgz" + "version" "2.0.1" + +"indent-string@^2.1.0": + "integrity" "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=" + "resolved" "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz" + "version" "2.1.0" + dependencies: + "repeating" "^2.0.0" + +"indent-string@^4.0.0": + "integrity" "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==" + "resolved" "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz" + "version" "4.0.0" + +"indexes-of@^1.0.1": + "integrity" "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=" + "resolved" "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz" + "version" "1.0.1" + +"indexof@0.0.1": + "integrity" "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=" + "resolved" "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz" + "version" "0.0.1" + +"inflight@^1.0.4": + "integrity" "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=" + "resolved" "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz" + "version" "1.0.6" + dependencies: + "once" "^1.3.0" + "wrappy" "1" + +"inherits@^2.0.1", "inherits@^2.0.3", "inherits@^2.0.4", "inherits@~2.0.0", "inherits@~2.0.3", "inherits@2", "inherits@2.0.4": + "integrity" "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + "resolved" "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz" + "version" "2.0.4" + +"inherits@2.0.3": + "integrity" "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + "resolved" "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz" + "version" "2.0.3" + +"ini@^1.3.4", "ini@^1.3.5", "ini@~1.3.0": + "integrity" "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" + "resolved" "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz" + "version" "1.3.8" + +"invert-kv@^2.0.0": + "integrity" "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==" + "resolved" "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz" + "version" "2.0.0" + +"iota-array@^1.0.0": + "integrity" "sha1-ge9X/l0FgUzVjCSDYyqZwwoOgIc=" + "resolved" "https://registry.npmjs.org/iota-array/-/iota-array-1.0.0.tgz" + "version" "1.0.0" + +"ipaddr.js@1.9.1": + "integrity" "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==" + "resolved" "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz" + "version" "1.9.1" + +"is-absolute-url@^2.0.0": + "integrity" "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=" + "resolved" "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz" + "version" "2.1.0" + +"is-accessor-descriptor@^0.1.6": + "integrity" "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=" + "resolved" "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz" + "version" "0.1.6" + dependencies: + "kind-of" "^3.0.2" + +"is-accessor-descriptor@^1.0.0": + "integrity" "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==" + "resolved" "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz" + "version" "1.0.0" + dependencies: + "kind-of" "^6.0.0" + +"is-arguments@^1.0.4": + "integrity" "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==" + "resolved" "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz" + "version" "1.0.4" + +"is-arrayish@^0.2.1": + "integrity" "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" + "resolved" "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz" + "version" "0.2.1" + +"is-arrayish@^0.3.1": + "integrity" "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==" + "resolved" "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz" + "version" "0.3.2" + +"is-bigint@^1.0.0": + "integrity" "sha512-t5mGUXC/xRheCK431ylNiSkGGpBp8bHENBcENTkDT6ppwPzEVxNGZRvgvmOEfbWkFhA7D2GEuE2mmQTr78sl2g==" + "resolved" "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.0.tgz" + "version" "1.0.0" + +"is-boolean-object@^1.0.0": + "integrity" "sha512-TqZuVwa/sppcrhUCAYkGBk7w0yxfQQnxq28fjkO53tnK9FQXmdwz2JS5+GjsWQ6RByES1K40nI+yDic5c9/aAQ==" + "resolved" "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.0.1.tgz" + "version" "1.0.1" + +"is-buffer@^1.0.2", "is-buffer@^1.1.5": + "integrity" "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" + "resolved" "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz" + "version" "1.1.6" + +"is-callable@^1.1.4": + "integrity" "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==" + "resolved" "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz" + "version" "1.1.4" + +"is-callable@^1.1.5": + "integrity" "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==" + "resolved" "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz" + "version" "1.2.0" + +"is-ci@^2.0.0": + "integrity" "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==" + "resolved" "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz" + "version" "2.0.0" + dependencies: + "ci-info" "^2.0.0" + +"is-color-stop@^1.0.0": + "integrity" "sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=" + "resolved" "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz" + "version" "1.1.0" + dependencies: + "css-color-names" "^0.0.4" + "hex-color-regex" "^1.1.0" + "hsl-regex" "^1.0.0" + "hsla-regex" "^1.0.0" + "rgb-regex" "^1.0.1" + "rgba-regex" "^1.0.0" + +"is-data-descriptor@^0.1.4": + "integrity" "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=" + "resolved" "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz" + "version" "0.1.4" + dependencies: + "kind-of" "^3.0.2" + +"is-data-descriptor@^1.0.0": + "integrity" "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==" + "resolved" "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz" + "version" "1.0.0" + dependencies: + "kind-of" "^6.0.0" + +"is-date-object@^1.0.1": + "integrity" "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=" + "resolved" "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz" + "version" "1.0.1" + +"is-date-object@^1.0.2": + "integrity" "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==" + "resolved" "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz" + "version" "1.0.2" + +"is-deflate@^1.0.0": + "integrity" "sha1-yGKQHDwWH7CdrHzcfnhPgOmPLxQ=" + "resolved" "https://registry.npmjs.org/is-deflate/-/is-deflate-1.0.0.tgz" + "version" "1.0.0" + +"is-descriptor@^0.1.0": + "integrity" "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==" + "resolved" "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz" + "version" "0.1.6" + dependencies: + "is-accessor-descriptor" "^0.1.6" + "is-data-descriptor" "^0.1.4" + "kind-of" "^5.0.0" + +"is-descriptor@^1.0.0", "is-descriptor@^1.0.2": + "integrity" "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==" + "resolved" "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz" + "version" "1.0.2" + dependencies: + "is-accessor-descriptor" "^1.0.0" + "is-data-descriptor" "^1.0.0" + "kind-of" "^6.0.2" + +"is-directory@^0.3.1": + "integrity" "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=" + "resolved" "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz" + "version" "0.3.1" + +"is-docker@^2.0.0": + "integrity" "sha512-pJEdRugimx4fBMra5z2/5iRdZ63OhYV0vr0Dwm5+xtW4D1FvRkB8hamMIhnWfyJeDdyr/aa7BDyNbtG38VxgoQ==" + "resolved" "https://registry.npmjs.org/is-docker/-/is-docker-2.0.0.tgz" + "version" "2.0.0" + +"is-extendable@^0.1.0", "is-extendable@^0.1.1": + "integrity" "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=" + "resolved" "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz" + "version" "0.1.1" + +"is-extendable@^1.0.1": + "integrity" "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==" + "resolved" "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz" + "version" "1.0.1" + dependencies: + "is-plain-object" "^2.0.4" + +"is-extglob@^2.1.0", "is-extglob@^2.1.1": + "integrity" "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" + "resolved" "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz" + "version" "2.1.1" + +"is-finite@^1.0.0": + "integrity" "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==" + "resolved" "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz" + "version" "1.1.0" + +"is-fullwidth-code-point@^1.0.0": + "integrity" "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=" + "resolved" "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz" + "version" "1.0.0" + dependencies: + "number-is-nan" "^1.0.0" + +"is-fullwidth-code-point@^2.0.0": + "integrity" "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" + "resolved" "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz" + "version" "2.0.0" + +"is-fullwidth-code-point@^3.0.0": + "integrity" "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" + "resolved" "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz" + "version" "3.0.0" + +"is-glob@^3.0.0": + "integrity" "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=" + "resolved" "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz" + "version" "3.1.0" + dependencies: + "is-extglob" "^2.1.0" + +"is-glob@^4.0.1": + "integrity" "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==" + "resolved" "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz" + "version" "4.0.1" + dependencies: + "is-extglob" "^2.1.1" + +"is-gzip@^1.0.0": + "integrity" "sha1-bKiwe5nHeZgCWQDlVc7Y7YCHmoM=" + "resolved" "https://registry.npmjs.org/is-gzip/-/is-gzip-1.0.0.tgz" + "version" "1.0.0" + +"is-installed-globally@^0.3.1": + "integrity" "sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g==" + "resolved" "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.3.2.tgz" + "version" "0.3.2" + dependencies: + "global-dirs" "^2.0.1" + "is-path-inside" "^3.0.1" + +"is-interactive@^1.0.0": + "integrity" "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==" + "resolved" "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz" + "version" "1.0.0" + +"is-map@^2.0.1": + "integrity" "sha512-T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw==" + "resolved" "https://registry.npmjs.org/is-map/-/is-map-2.0.1.tgz" + "version" "2.0.1" + +"is-module@^1.0.0": + "integrity" "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=" + "resolved" "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz" + "version" "1.0.0" + +"is-npm@^4.0.0": + "integrity" "sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig==" + "resolved" "https://registry.npmjs.org/is-npm/-/is-npm-4.0.0.tgz" + "version" "4.0.0" + +"is-number-object@^1.0.3": + "integrity" "sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==" + "resolved" "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.4.tgz" + "version" "1.0.4" + +"is-number@^3.0.0": + "integrity" "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=" + "resolved" "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz" + "version" "3.0.0" + dependencies: + "kind-of" "^3.0.2" + +"is-number@^7.0.0": + "integrity" "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" + "resolved" "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz" + "version" "7.0.0" + +"is-obj@^1.0.0": + "integrity" "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=" + "resolved" "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz" + "version" "1.0.1" + +"is-obj@^2.0.0": + "integrity" "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==" + "resolved" "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz" + "version" "2.0.0" + +"is-path-inside@^3.0.1": + "integrity" "sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==" + "resolved" "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz" + "version" "3.0.2" + +"is-plain-object@^2.0.3", "is-plain-object@^2.0.4": + "integrity" "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==" + "resolved" "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz" + "version" "2.0.4" + dependencies: + "isobject" "^3.0.1" + +"is-regex@^1.0.4": + "integrity" "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=" + "resolved" "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz" + "version" "1.0.4" + dependencies: + "has" "^1.0.1" + +"is-regex@^1.0.5": + "integrity" "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==" + "resolved" "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz" + "version" "1.1.0" + dependencies: + "has-symbols" "^1.0.1" + +"is-resolvable@^1.0.0": + "integrity" "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==" + "resolved" "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz" + "version" "1.1.0" + +"is-set@^2.0.1": + "integrity" "sha512-eJEzOtVyenDs1TMzSQ3kU3K+E0GUS9sno+F0OBT97xsgcJsF9nXMBtkT9/kut5JEpM7oL7X/0qxR17K3mcwIAA==" + "resolved" "https://registry.npmjs.org/is-set/-/is-set-2.0.1.tgz" + "version" "2.0.1" + +"is-stream@^1.0.1", "is-stream@^1.1.0": + "integrity" "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" + "resolved" "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz" + "version" "1.1.0" + +"is-stream@^2.0.0": + "integrity" "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==" + "resolved" "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz" + "version" "2.0.0" + +"is-string@^1.0.4", "is-string@^1.0.5": + "integrity" "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==" + "resolved" "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz" + "version" "1.0.5" + +"is-svg@^3.0.0": + "integrity" "sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ==" + "resolved" "https://registry.npmjs.org/is-svg/-/is-svg-3.0.0.tgz" + "version" "3.0.0" + dependencies: + "html-comment-regex" "^1.1.0" + +"is-symbol@^1.0.2": + "integrity" "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==" + "resolved" "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz" + "version" "1.0.2" + dependencies: + "has-symbols" "^1.0.0" + +"is-typed-array@^1.1.3": + "integrity" "sha512-BSYUBOK/HJibQ30wWkWold5txYwMUXQct9YHAQJr8fSwvZoiglcqB0pd7vEN23+Tsi9IUEjztdOSzl4qLVYGTQ==" + "resolved" "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.3.tgz" + "version" "1.1.3" + dependencies: + "available-typed-arrays" "^1.0.0" + "es-abstract" "^1.17.4" + "foreach" "^2.0.5" + "has-symbols" "^1.0.1" + +"is-typedarray@^1.0.0", "is-typedarray@~1.0.0": + "integrity" "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" + "resolved" "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz" + "version" "1.0.0" + +"is-unicode-supported@^0.1.0": + "integrity" "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==" + "resolved" "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz" + "version" "0.1.0" + +"is-utf8@^0.2.0": + "integrity" "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=" + "resolved" "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz" + "version" "0.2.1" + +"is-valid-glob@^1.0.0": + "integrity" "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=" + "resolved" "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz" + "version" "1.0.0" + +"is-weakmap@^2.0.1": + "integrity" "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==" + "resolved" "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz" + "version" "2.0.1" + +"is-weakset@^2.0.1": + "integrity" "sha512-pi4vhbhVHGLxohUw7PhGsueT4vRGFoXhP7+RGN0jKIv9+8PWYCQTqtADngrxOm2g46hoH0+g8uZZBzMrvVGDmw==" + "resolved" "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.1.tgz" + "version" "2.0.1" + +"is-windows@^1.0.1", "is-windows@^1.0.2": + "integrity" "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==" + "resolved" "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz" + "version" "1.0.2" + +"is-wsl@^2.1.1": + "integrity" "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==" + "resolved" "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz" + "version" "2.2.0" + dependencies: + "is-docker" "^2.0.0" + +"is-yarn-global@^0.3.0": + "integrity" "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==" + "resolved" "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz" + "version" "0.3.0" + +"isarray@^2.0.5": + "integrity" "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==" + "resolved" "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz" + "version" "2.0.5" + +"isarray@~1.0.0": + "integrity" "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + "resolved" "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" + "version" "1.0.0" + +"isarray@1.0.0": + "integrity" "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + "resolved" "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" + "version" "1.0.0" + +"isarray@2.0.1": + "integrity" "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=" + "resolved" "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz" + "version" "2.0.1" + +"isexe@^2.0.0": + "integrity" "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" + "resolved" "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz" + "version" "2.0.0" + +"isobject@^2.0.0": + "integrity" "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=" + "resolved" "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz" + "version" "2.1.0" + dependencies: + "isarray" "1.0.0" + +"isobject@^3.0.0", "isobject@^3.0.1": + "integrity" "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + "resolved" "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz" + "version" "3.0.1" + +"isstream@~0.1.2": + "integrity" "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" + "resolved" "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz" + "version" "0.1.2" + +"jest-worker@^24.0.0": + "integrity" "sha512-jDwgW5W9qGNvpI1tNnvajh0a5IE/PuGLFmHk6aR/BZFz8tSgGw17GsDPXAJ6p91IvYDjOw8GpFbvvZGAK+DPQQ==" + "resolved" "https://registry.npmjs.org/jest-worker/-/jest-worker-24.6.0.tgz" + "version" "24.6.0" + dependencies: + "merge-stream" "^1.0.1" + "supports-color" "^6.1.0" + +"jpeg-js@^0.3.2": + "integrity" "sha512-MUj2XlMB8kpe+8DJUGH/3UJm4XpI8XEgZQ+CiHDeyrGoKPdW/8FJv6ku+3UiYm5Fz3CWaL+iXmD8Q4Ap6aC1Jw==" + "resolved" "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.3.6.tgz" + "version" "0.3.6" + +"jquery@>=2.0.0 <4.0.0", "jquery@1.9.1 - 3": + "integrity" "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + "resolved" "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz" + "version" "3.6.0" + +"js-base64@^2.1.8": + "integrity" "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + "resolved" "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz" + "version" "2.6.4" + +"js-base64@^2.1.9": + "integrity" "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==" + "resolved" "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz" + "version" "2.5.1" + +"js-sha256@^0.9.0": + "integrity" "sha512-sga3MHh9sgQN2+pJ9VYZ+1LPwXOxuBJBA5nrR5/ofPfuiJBE2hnjsaN8se8JznOmGLN2p49Pe5U/ttafcs/apA==" + "resolved" "https://registry.npmjs.org/js-sha256/-/js-sha256-0.9.0.tgz" + "version" "0.9.0" + +"js-tokens@^4.0.0": + "integrity" "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" + "resolved" "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz" + "version" "4.0.0" + +"js-yaml@^3.12.0", "js-yaml@^3.13.1", "js-yaml@^3.9.0": + "integrity" "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==" + "resolved" "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz" + "version" "3.14.0" + dependencies: + "argparse" "^1.0.7" + "esprima" "^4.0.0" + +"jsbarcode@^3.9.0": + "integrity" "sha512-/ozCd7wsa+VIHo9sUc03HneVEQrH7cVWfJolUT/WOW1m8mJ2e3iYZje6C9X3LFHdczlesqFHRpxLtbVsNtjyow==" + "resolved" "https://registry.npmjs.org/jsbarcode/-/jsbarcode-3.11.0.tgz" + "version" "3.11.0" + +"jsbn@~0.1.0": + "integrity" "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=" + "resolved" "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz" + "version" "0.1.1" + +"jsesc@~0.5.0": + "integrity" "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=" + "resolved" "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz" + "version" "0.5.0" + +"json-buffer@3.0.0": + "integrity" "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=" + "resolved" "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz" + "version" "3.0.0" + +"json-buffer@3.0.1": + "integrity" "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==" + "resolved" "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz" + "version" "3.0.1" + +"json-parse-better-errors@^1.0.1": + "integrity" "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==" + "resolved" "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz" + "version" "1.0.2" + +"json-schema-traverse@^0.4.1": + "integrity" "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + "resolved" "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz" + "version" "0.4.1" + +"json-schema@0.2.3": + "integrity" "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" + "resolved" "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz" + "version" "0.2.3" + +"json-stringify-safe@^5.0.1", "json-stringify-safe@~5.0.1": + "integrity" "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" + "resolved" "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz" + "version" "5.0.1" + +"json5@^0.5.0": + "integrity" "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=" + "resolved" "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz" + "version" "0.5.1" + +"jsonfile@^2.1.0": + "integrity" "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=" + "resolved" "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz" + "version" "2.4.0" optionalDependencies: - graceful-fs "^4.1.6" - -jsprim@^1.2.2: - version "1.4.1" - resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" - integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI= - dependencies: - assert-plus "1.0.0" - extsprintf "1.3.0" - json-schema "0.2.3" - verror "1.10.0" - -jszip@3.4.0, jszip@^3.2.2: - version "3.4.0" - resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.4.0.tgz#1a69421fa5f0bb9bc222a46bca88182fba075350" - integrity sha512-gZAOYuPl4EhPTXT0GjhI3o+ZAz3su6EhLrKUoAivcKqyqC7laS5JEv4XWZND9BgcDcF83vI85yGbDmDR6UhrIg== - dependencies: - lie "~3.3.0" - pako "~1.0.2" - readable-stream "~2.3.6" - set-immediate-shim "~1.0.1" - -kew@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/kew/-/kew-0.7.0.tgz#79d93d2d33363d6fdd2970b335d9141ad591d79b" - integrity sha1-edk9LTM2PW/dKXCzNdkUGtWR15s= - -keyv@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9" - integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA== - dependencies: - json-buffer "3.0.0" - -keyv@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.0.1.tgz#9fe703cb4a94d6d11729d320af033307efd02ee6" - integrity sha512-xz6Jv6oNkbhrFCvCP7HQa8AaII8y8LRpoSm661NOKLr4uHuBwhX4epXrPQgF3+xdJnN4Esm5X0xwY4bOlALOtw== - dependencies: - json-buffer "3.0.1" - -kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: - version "3.2.2" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" - integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= - dependencies: - is-buffer "^1.1.5" - -kind-of@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" - integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc= - dependencies: - is-buffer "^1.1.5" - -kind-of@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" - integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== - -kind-of@^6.0.0, kind-of@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051" - integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA== - -klaw@^1.0.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439" - integrity sha1-QIhDO0azsbolnXh4XY6W9zugJDk= + "graceful-fs" "^4.1.6" + +"jsprim@^1.2.2": + "integrity" "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=" + "resolved" "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz" + "version" "1.4.1" + dependencies: + "assert-plus" "1.0.0" + "extsprintf" "1.3.0" + "json-schema" "0.2.3" + "verror" "1.10.0" + +"jszip@^3.2.2", "jszip@3.4.0": + "integrity" "sha512-gZAOYuPl4EhPTXT0GjhI3o+ZAz3su6EhLrKUoAivcKqyqC7laS5JEv4XWZND9BgcDcF83vI85yGbDmDR6UhrIg==" + "resolved" "https://registry.npmjs.org/jszip/-/jszip-3.4.0.tgz" + "version" "3.4.0" + dependencies: + "lie" "~3.3.0" + "pako" "~1.0.2" + "readable-stream" "~2.3.6" + "set-immediate-shim" "~1.0.1" + +"kew@^0.7.0": + "integrity" "sha1-edk9LTM2PW/dKXCzNdkUGtWR15s=" + "resolved" "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz" + "version" "0.7.0" + +"keyv@^3.0.0": + "integrity" "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==" + "resolved" "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz" + "version" "3.1.0" + dependencies: + "json-buffer" "3.0.0" + +"keyv@^4.0.0": + "integrity" "sha512-xz6Jv6oNkbhrFCvCP7HQa8AaII8y8LRpoSm661NOKLr4uHuBwhX4epXrPQgF3+xdJnN4Esm5X0xwY4bOlALOtw==" + "resolved" "https://registry.npmjs.org/keyv/-/keyv-4.0.1.tgz" + "version" "4.0.1" + dependencies: + "json-buffer" "3.0.1" + +"kind-of@^3.0.2", "kind-of@^3.0.3", "kind-of@^3.2.0": + "integrity" "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=" + "resolved" "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz" + "version" "3.2.2" + dependencies: + "is-buffer" "^1.1.5" + +"kind-of@^4.0.0": + "integrity" "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=" + "resolved" "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz" + "version" "4.0.0" + dependencies: + "is-buffer" "^1.1.5" + +"kind-of@^5.0.0": + "integrity" "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" + "resolved" "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz" + "version" "5.1.0" + +"kind-of@^6.0.0": + "integrity" "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" + "resolved" "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz" + "version" "6.0.3" + +"kind-of@^6.0.2": + "integrity" "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" + "resolved" "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz" + "version" "6.0.3" + +"klaw@^1.0.0": + "integrity" "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=" + "resolved" "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz" + "version" "1.3.1" optionalDependencies: - graceful-fs "^4.1.9" + "graceful-fs" "^4.1.9" -kuler@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/kuler/-/kuler-2.0.0.tgz#e2c570a3800388fb44407e851531c1d670b061b3" - integrity sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A== +"kuler@^2.0.0": + "integrity" "sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==" + "resolved" "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz" + "version" "2.0.0" -latest-version@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" - integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA== +"latest-version@^5.0.0": + "integrity" "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==" + "resolved" "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz" + "version" "5.1.0" dependencies: - package-json "^6.3.0" + "package-json" "^6.3.0" -lcid@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf" - integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA== +"lcid@^2.0.0": + "integrity" "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==" + "resolved" "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz" + "version" "2.0.0" dependencies: - invert-kv "^2.0.0" + "invert-kv" "^2.0.0" -less@^3.11.1: - version "3.11.1" - resolved "https://registry.yarnpkg.com/less/-/less-3.11.1.tgz#c6bf08e39e02404fe6b307a3dfffafdc55bd36e2" - integrity sha512-tlWX341RECuTOvoDIvtFqXsKj072hm3+9ymRBe76/mD6O5ZZecnlAOVDlWAleF2+aohFrxNidXhv2773f6kY7g== +"less@^3.11.1": + "integrity" "sha512-tlWX341RECuTOvoDIvtFqXsKj072hm3+9ymRBe76/mD6O5ZZecnlAOVDlWAleF2+aohFrxNidXhv2773f6kY7g==" + "resolved" "https://registry.npmjs.org/less/-/less-3.11.1.tgz" + "version" "3.11.1" dependencies: - clone "^2.1.2" - tslib "^1.10.0" + "clone" "^2.1.2" + "tslib" "^1.10.0" optionalDependencies: - errno "^0.1.1" - graceful-fs "^4.1.2" - image-size "~0.5.0" - mime "^1.4.1" - mkdirp "^0.5.0" - promise "^7.1.1" - request "^2.83.0" - source-map "~0.6.0" - -lie@3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e" - integrity sha1-mkNrLMd0bKWd56QfpGmz77dr2H4= - dependencies: - immediate "~3.0.5" - -lie@~3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/lie/-/lie-3.3.0.tgz#dcf82dee545f46074daf200c7c1c5a08e0f40f6a" - integrity sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ== - dependencies: - immediate "~3.0.5" - -load-json-file@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0" - integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA= - dependencies: - graceful-fs "^4.1.2" - parse-json "^2.2.0" - pify "^2.0.0" - pinkie-promise "^2.0.0" - strip-bom "^2.0.0" - -loader-utils@^0.2.16: - version "0.2.17" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348" - integrity sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g= - dependencies: - big.js "^3.1.3" - emojis-list "^2.0.0" - json5 "^0.5.0" - object-assign "^4.0.1" - -loadjs@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/loadjs/-/loadjs-4.2.0.tgz#2a0336376397a6a43edf98c9ec3229ddd5abb6f6" - integrity sha512-AgQGZisAlTPbTEzrHPb6q+NYBMD+DP9uvGSIjSUM5uG+0jG15cb8axWpxuOIqrmQjn6scaaH8JwloiP27b2KXA== - -localforage@^1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/localforage/-/localforage-1.9.0.tgz#f3e4d32a8300b362b4634cc4e066d9d00d2f09d1" - integrity sha512-rR1oyNrKulpe+VM9cYmcFn6tsHuokyVHFaCM3+osEmxaHTbEk8oQu6eGDfS6DQLWi/N67XRmB8ECG37OES368g== - dependencies: - lie "3.1.1" - -locate-path@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" - integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A== - dependencies: - p-locate "^3.0.0" - path-exists "^3.0.0" - -lodash._arraymap@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash._arraymap/-/lodash._arraymap-3.0.0.tgz#1a8fd0f4c0df4b61dea076d717cdc97f0a3c3e66" - integrity sha1-Go/Q9MDfS2HeoHbXF83Jfwo8PmY= - -lodash._basecallback@^3.0.0: - version "3.3.1" - resolved "https://registry.yarnpkg.com/lodash._basecallback/-/lodash._basecallback-3.3.1.tgz#b7b2bb43dc2160424a21ccf26c57e443772a8e27" - integrity sha1-t7K7Q9whYEJKIczybFfkQ3cqjic= - dependencies: - lodash._baseisequal "^3.0.0" - lodash._bindcallback "^3.0.0" - lodash.isarray "^3.0.0" - lodash.pairs "^3.0.0" - -lodash._baseeach@^3.0.0: - version "3.0.4" - resolved "https://registry.yarnpkg.com/lodash._baseeach/-/lodash._baseeach-3.0.4.tgz#cf8706572ca144e8d9d75227c990da982f932af3" - integrity sha1-z4cGVyyhROjZ11InyZDamC+TKvM= - dependencies: - lodash.keys "^3.0.0" - -lodash._baseget@^3.0.0: - version "3.7.2" - resolved "https://registry.yarnpkg.com/lodash._baseget/-/lodash._baseget-3.7.2.tgz#1b6ae1d5facf3c25532350a13c1197cb8bb674f4" - integrity sha1-G2rh1frPPCVTI1ChPBGXy4u2dPQ= - -lodash._baseisequal@^3.0.0: - version "3.0.7" - resolved "https://registry.yarnpkg.com/lodash._baseisequal/-/lodash._baseisequal-3.0.7.tgz#d8025f76339d29342767dcc887ce5cb95a5b51f1" - integrity sha1-2AJfdjOdKTQnZ9zIh85cuVpbUfE= - dependencies: - lodash.isarray "^3.0.0" - lodash.istypedarray "^3.0.0" - lodash.keys "^3.0.0" - -lodash._bindcallback@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e" - integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4= - -lodash._getnative@^3.0.0: - version "3.9.1" - resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" - integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U= - -lodash._topath@^3.0.0: - version "3.8.1" - resolved "https://registry.yarnpkg.com/lodash._topath/-/lodash._topath-3.8.1.tgz#3ec5e2606014f4cb97f755fe6914edd8bfc00eac" - integrity sha1-PsXiYGAU9MuX91X+aRTt2L/ADqw= - dependencies: - lodash.isarray "^3.0.0" - -lodash.assign@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7" - integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc= - -lodash.assignin@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2" - integrity sha1-uo31+4QesKPoBEIysOJjqNxqKKI= - -lodash.camelcase@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" - integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY= - -lodash.chunk@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.chunk/-/lodash.chunk-4.2.0.tgz#66e5ce1f76ed27b4303d8c6512e8d1216e8106bc" - integrity sha1-ZuXOH3btJ7QwPYxlEujRIW6BBrw= - -lodash.clone@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.clone/-/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6" - integrity sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y= - -lodash.clonedeep@^4.3.0, lodash.clonedeep@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" - integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= - -lodash.constant@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash.constant/-/lodash.constant-3.0.0.tgz#bfe05cce7e515b3128925d6362138420bd624910" - integrity sha1-v+Bczn5RWzEokl1jYhOEIL1iSRA= - -lodash.defaults@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" - integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw= - -lodash.endswith@^4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/lodash.endswith/-/lodash.endswith-4.2.1.tgz#fed59ac1738ed3e236edd7064ec456448b37bc09" - integrity sha1-/tWawXOO0+I27dcGTsRWRIs3vAk= - -lodash.filter@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.filter/-/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace" - integrity sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4= - -lodash.find@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.find/-/lodash.find-4.6.0.tgz#cb0704d47ab71789ffa0de8b97dd926fb88b13b1" - integrity sha1-ywcE1Hq3F4n/oN6Ll92Sb7iLE7E= - -lodash.findindex@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.findindex/-/lodash.findindex-4.6.0.tgz#a3245dee61fb9b6e0624b535125624bb69c11106" - integrity sha1-oyRd7mH7m24GJLU1ElYku2nBEQY= - -lodash.findkey@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.findkey/-/lodash.findkey-4.6.0.tgz#83058e903b51cbb759d09ccf546dea3ea39c4718" - integrity sha1-gwWOkDtRy7dZ0JzPVG3qPqOcRxg= - -lodash.flatmap@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.flatmap/-/lodash.flatmap-4.5.0.tgz#ef8cbf408f6e48268663345305c6acc0b778702e" - integrity sha1-74y/QI9uSCaGYzRTBcaswLd4cC4= - -lodash.flatten@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" - integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8= - -lodash.flattendeep@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2" - integrity sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI= - -lodash.foreach@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53" - integrity sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM= - -lodash.get@^4.4.2: - version "4.4.2" - resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" - integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk= - -lodash.groupby@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.groupby/-/lodash.groupby-4.6.0.tgz#0b08a1dcf68397c397855c3239783832df7403d1" - integrity sha1-Cwih3PaDl8OXhVwyOXg4Mt90A9E= - -lodash.has@^4.5.2: - version "4.5.2" - resolved "https://registry.yarnpkg.com/lodash.has/-/lodash.has-4.5.2.tgz#d19f4dc1095058cccbe2b0cdf4ee0fe4aa37c862" - integrity sha1-0Z9NwQlQWMzL4rDN9O4P5Ko3yGI= - -lodash.invert@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/lodash.invert/-/lodash.invert-4.3.0.tgz#8ffe20d4b616f56bea8f1aa0c6ebd80dcf742aee" - integrity sha1-j/4g1LYW9WvqjxqgxuvYDc90Ku4= - -lodash.isarguments@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a" - integrity sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo= - -lodash.isarray@^3.0.0: - version "3.0.4" - resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55" - integrity sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U= - -lodash.isboolean@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6" - integrity sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY= - -lodash.isempty@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.isempty/-/lodash.isempty-4.4.0.tgz#6f86cbedd8be4ec987be9aaf33c9684db1b31e7e" - integrity sha1-b4bL7di+TsmHvpqvM8loTbGzHn4= - -lodash.isequal@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" - integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA= - -lodash.isfunction@^3.0.9: - version "3.0.9" - resolved "https://registry.yarnpkg.com/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz#06de25df4db327ac931981d1bdb067e5af68d051" - integrity sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw== - -lodash.isnumber@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz#3ce76810c5928d03352301ac287317f11c0b1ffc" - integrity sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w= - -lodash.isobject@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/lodash.isobject/-/lodash.isobject-3.0.2.tgz#3c8fb8d5b5bf4bf90ae06e14f2a530a4ed935e1d" - integrity sha1-PI+41bW/S/kK4G4U8qUwpO2TXh0= - -lodash.isplainobject@^4.0.6: - version "4.0.6" - resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" - integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs= - -lodash.isstring@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451" - integrity sha1-1SfftUVuynzJu5XV2ur4i6VKVFE= - -lodash.istypedarray@^3.0.0: - version "3.0.6" - resolved "https://registry.yarnpkg.com/lodash.istypedarray/-/lodash.istypedarray-3.0.6.tgz#c9a477498607501d8e8494d283b87c39281cef62" - integrity sha1-yaR3SYYHUB2OhJTSg7h8OSgc72I= - -lodash.isundefined@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash.isundefined/-/lodash.isundefined-3.0.1.tgz#23ef3d9535565203a66cefd5b830f848911afb48" - integrity sha1-I+89lTVWUgOmbO/VuDD4SJEa+0g= - -lodash.keys@^3.0.0: - version "3.1.2" - resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a" - integrity sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo= - dependencies: - lodash._getnative "^3.0.0" - lodash.isarguments "^3.0.0" - lodash.isarray "^3.0.0" - -lodash.keys@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-4.2.0.tgz#a08602ac12e4fb83f91fc1fb7a360a4d9ba35205" - integrity sha1-oIYCrBLk+4P5H8H7ejYKTZujUgU= - -lodash.last@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash.last/-/lodash.last-3.0.0.tgz#242f663112dd4c6e63728c60a3c909d1bdadbd4c" - integrity sha1-JC9mMRLdTG5jcoxgo8kJ0b2tvUw= - -lodash.map@^3.0.0: - version "3.1.4" - resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-3.1.4.tgz#b483acd1b786c5c7b492c495f7b5266229bc00c2" - integrity sha1-tIOs0beGxce0ksSV97UmYim8AMI= - dependencies: - 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.map@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3" - integrity sha1-dx7Hg540c9nEzeKLGTlMNWL09tM= - -lodash.memoize@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" - integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= - -lodash.merge@^4.6.2: - version "4.6.2" - resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" - integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== - -lodash.omit@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.omit/-/lodash.omit-4.5.0.tgz#6eb19ae5a1ee1dd9df0b969e66ce0b7fa30b5e60" - integrity sha1-brGa5aHuHdnfC5aeZs4Lf6MLXmA= - -lodash.orderby@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.orderby/-/lodash.orderby-4.6.0.tgz#e697f04ce5d78522f54d9338b32b81a3393e4eb3" - integrity sha1-5pfwTOXXhSL1TZM4syuBozk+TrM= - -lodash.pairs@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash.pairs/-/lodash.pairs-3.0.1.tgz#bbe08d5786eeeaa09a15c91ebf0dcb7d2be326a9" - integrity sha1-u+CNV4bu6qCaFckevw3LfSvjJqk= - dependencies: - lodash.keys "^3.0.0" - -lodash.pluck@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/lodash.pluck/-/lodash.pluck-3.1.2.tgz#b347f0374c0169f0eeb04d672d89cec8632c2231" - integrity sha1-s0fwN0wBafDusE1nLYnOyGMsIjE= - dependencies: - lodash._baseget "^3.0.0" - lodash._topath "^3.0.0" - lodash.isarray "^3.0.0" - lodash.map "^3.0.0" - -lodash.reduce@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.reduce/-/lodash.reduce-4.6.0.tgz#f1ab6b839299ad48f784abbf476596f03b914d3b" - integrity sha1-8atrg5KZrUj3hKu/R2WW8DuRTTs= - -lodash.set@^4.3.2: - version "4.3.2" - resolved "https://registry.yarnpkg.com/lodash.set/-/lodash.set-4.3.2.tgz#d8757b1da807dde24816b0d6a84bea1a76230b23" - integrity sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM= - -lodash.size@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.size/-/lodash.size-4.2.0.tgz#71fe75ed3eabdb2bcb73a1b0b4f51c392ee27b86" - integrity sha1-cf517T6r2yvLc6GwtPUcOS7ie4Y= - -lodash.sortby@^4.7.0: - version "4.7.0" - resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" - integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg= - -lodash.sum@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/lodash.sum/-/lodash.sum-4.0.2.tgz#ad90e397965d803d4f1ff7aa5b2d0197f3b4637b" - integrity sha1-rZDjl5ZdgD1PH/eqWy0Bl/O0Y3s= - -lodash.topairs@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/lodash.topairs/-/lodash.topairs-4.3.0.tgz#3b6deaa37d60fb116713c46c5f17ea190ec48d64" - integrity sha1-O23qo31g+xFnE8RsXxfqGQ7EjWQ= - -lodash.transform@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.transform/-/lodash.transform-4.6.0.tgz#12306422f63324aed8483d3f38332b5f670547a0" - integrity sha1-EjBkIvYzJK7YSD0/ODMrX2cFR6A= - -lodash.union@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88" - integrity sha1-SLtQiECfFvGCFmZkHETdGqrjzYg= - -lodash.uniq@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" - integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= - -lodash.upperfirst@^4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz#1365edf431480481ef0d1c68957a5ed99d49f7ce" - integrity sha1-E2Xt9DFIBIHvDRxolXpe2Z1J984= - -lodash.values@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/lodash.values/-/lodash.values-4.3.0.tgz#a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347" - integrity sha1-o6bCsOvsxcLLocF+bmIP6BtT00c= - -lodash@^4.0.0, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.10: - version "4.17.20" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" - integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== - -log-symbols@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503" - integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg== - dependencies: - chalk "^4.1.0" - is-unicode-supported "^0.1.0" - -logform@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/logform/-/logform-2.2.0.tgz#40f036d19161fc76b68ab50fdc7fe495544492f2" - integrity sha512-N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg== - dependencies: - colors "^1.2.1" - fast-safe-stringify "^2.0.4" - fecha "^4.2.0" - ms "^2.1.1" - triple-beam "^1.3.0" - -loud-rejection@^1.0.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f" - integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8= - dependencies: - currently-unhandled "^0.4.1" - signal-exit "^3.0.0" - -lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" - integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA== - -lowercase-keys@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" - integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA== - -lru-cache@^4.0.0, lru-cache@^4.0.1, lru-cache@^4.1.2: - version "4.1.5" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" - integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== - dependencies: - pseudomap "^1.0.2" - yallist "^2.1.2" - -lru-cache@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920" - integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w== - dependencies: - yallist "^3.0.2" - -lru-cache@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" - integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== - dependencies: - yallist "^4.0.0" - -macos-release@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.3.0.tgz#eb1930b036c0800adebccd5f17bc4c12de8bb71f" - integrity sha512-OHhSbtcviqMPt7yfw5ef5aghS2jzFVKEFyCJndQt2YpSQ9qRVSEv2axSJI1paVThEu+FFGs584h/1YhxjVqajA== - -magic-string@^0.22.4: - version "0.22.5" - resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.5.tgz#8e9cf5afddf44385c1da5bc2a6a0dbd10b03657e" - integrity sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w== - dependencies: - vlq "^0.2.2" - -magic-string@^0.25.1: - version "0.25.2" - resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.2.tgz#139c3a729515ec55e96e69e82a11fe890a293ad9" - integrity sha512-iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg== - dependencies: - sourcemap-codec "^1.4.4" - -make-dir@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" - integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== - dependencies: - semver "^6.0.0" - -map-age-cleaner@^0.1.1: - version "0.1.3" - resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a" - integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w== - dependencies: - p-defer "^1.0.0" - -map-cache@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" - integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8= - -map-obj@^1.0.0, map-obj@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" - integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0= - -map-visit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" - integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48= - dependencies: - object-visit "^1.0.0" - -matched@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/matched/-/matched-1.0.2.tgz#1d95d77dd5f1b5075a9e94acde5462ffd85f317a" - integrity sha512-7ivM1jFZVTOOS77QsR+TtYHH0ecdLclMkqbf5qiJdX2RorqfhsL65QHySPZgDE0ZjHoh+mQUNHTanNXIlzXd0Q== - dependencies: - arr-union "^3.1.0" - async-array-reduce "^0.2.1" - glob "^7.1.2" - has-glob "^1.0.0" - is-valid-glob "^1.0.0" - resolve-dir "^1.0.0" - -matcher@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca" - integrity sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng== - dependencies: - escape-string-regexp "^4.0.0" - -mdn-data@2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b" - integrity sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA== - -mdn-data@2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.6.tgz#852dc60fcaa5daa2e8cf6c9189c440ed3e042978" - integrity sha512-rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA== - -mdn-data@~1.1.0: - version "1.1.4" - resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-1.1.4.tgz#50b5d4ffc4575276573c4eedb8780812a8419f01" - integrity sha512-FSYbp3lyKjyj3E7fMl6rYvUdX0FBXaluGqlFoYESWQlyUTq8R+wp0rkFxoYFqZlHCvsUXGjyJmLQSnXToYhOSA== - -media-typer@0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" - integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= - -mem@^4.0.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178" - integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w== - dependencies: - map-age-cleaner "^0.1.1" - mimic-fn "^2.0.0" - p-is-promise "^2.0.0" - -meow@^3.7.0: - version "3.7.0" - resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb" - integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs= - dependencies: - camelcase-keys "^2.0.0" - decamelize "^1.1.2" - loud-rejection "^1.0.0" - map-obj "^1.0.1" - minimist "^1.1.3" - normalize-package-data "^2.3.4" - object-assign "^4.0.1" - read-pkg-up "^1.0.1" - redent "^1.0.0" - trim-newlines "^1.0.0" - -merge-descriptors@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" - integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= - -merge-source-map@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646" - integrity sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw== - dependencies: - source-map "^0.6.1" - -merge-stream@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1" - integrity sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE= - dependencies: - readable-stream "^2.0.1" - -merge2@^1.3.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" - integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== - -methods@^1.1.1, methods@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" - integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= - -micromatch@4.0.2, micromatch@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259" - integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q== - dependencies: - braces "^3.0.1" - picomatch "^2.0.5" - -micromatch@^3.1.10: - version "3.1.10" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" - integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== - dependencies: - arr-diff "^4.0.0" - array-unique "^0.3.2" - braces "^2.3.1" - define-property "^2.0.2" - extend-shallow "^3.0.2" - extglob "^2.0.4" - fragment-cache "^0.2.1" - kind-of "^6.0.2" - nanomatch "^1.2.9" - object.pick "^1.3.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.2" - -mime-db@1.40.0: - version "1.40.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32" - integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA== - -mime-db@1.43.0: - version "1.43.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz#0a12e0502650e473d735535050e7c8f4eb4fae58" - integrity sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ== - -mime-db@1.44.0: - version "1.44.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92" - integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg== - -mime-types@^2.0.1: - version "2.1.24" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81" - integrity sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ== - dependencies: - mime-db "1.40.0" - -mime-types@^2.1.12, mime-types@~2.1.19: - version "2.1.27" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f" - integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w== - dependencies: - mime-db "1.44.0" - -mime-types@~2.1.24: - version "2.1.26" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz#9c921fc09b7e149a65dfdc0da4d20997200b0a06" - integrity sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ== - dependencies: - mime-db "1.43.0" - -mime@1.6.0, mime@^1.4.1: - version "1.6.0" - resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" - integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== - -mimic-fn@^2.0.0, mimic-fn@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" - integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== - -mimic-response@^1.0.0, mimic-response@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" - integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== - -mimic-response@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" - integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== - -minimatch@3.0.4, minimatch@^3.0.4, minimatch@~3.0.2: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== - dependencies: - brace-expansion "^1.1.7" - -minimist@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" - integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0= - -minimist@^1.1.3, minimist@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== - -minimist@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" - integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= - -minipass@^3.0.0: - version "3.1.3" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd" - integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg== - dependencies: - yallist "^4.0.0" - -minizlib@^2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" - integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== - dependencies: - minipass "^3.0.0" - yallist "^4.0.0" - -mixin-deep@^1.2.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" - integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA== - dependencies: - for-in "^1.0.2" - is-extendable "^1.0.1" - -mkdirp@0.5.1, mkdirp@~0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" - integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= - dependencies: - minimist "0.0.8" - -"mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.4: - version "0.5.5" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" - integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== - dependencies: - minimist "^1.2.5" - -mkdirp@^1.0.3, mkdirp@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" - integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== - -mocha@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6" - integrity sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ== - dependencies: - 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" - -moment-timezone@^0.5.28: - version "0.5.28" - resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.28.tgz#f093d789d091ed7b055d82aa81a82467f72e4338" - integrity sha512-TDJkZvAyKIVWg5EtVqRzU97w0Rb0YVbfpqyjgu6GwXCAohVRqwZjf4fOzDE6p1Ch98Sro/8hQQi65WDXW5STPw== - dependencies: - moment ">= 2.9.0" - -"moment@>= 2.9.0", moment@^2.20.1: - version "2.24.0" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b" - integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg== - -ms@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= - -ms@2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" - integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== - -ms@2.1.2, ms@^2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" - integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== - -mustache@^3.0.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/mustache/-/mustache-3.2.1.tgz#89e78a9d207d78f2799b1e95764a25bf71a28322" - integrity sha512-RERvMFdLpaFfSRIEe632yDm5nsd0SDKn8hGmcUwswnyiE5mtdZLDybtHAz6hjJhawokF0hXvGLtx9mrQfm6FkA== - -mute-stream@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" - integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== - -nan@^2.13.2: - version "2.14.1" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz#d7be34dfa3105b91494c3147089315eff8874b01" - integrity sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw== - -nanomatch@^1.2.9: - version "1.2.13" - resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" - integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA== - dependencies: - arr-diff "^4.0.0" - array-unique "^0.3.2" - define-property "^2.0.2" - extend-shallow "^3.0.2" - fragment-cache "^0.2.1" - is-windows "^1.0.2" - kind-of "^6.0.2" - object.pick "^1.3.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -ndarray-linear-interpolate@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/ndarray-linear-interpolate/-/ndarray-linear-interpolate-1.0.0.tgz#78bc92b85b9abc15b6e67ee65828f9e2137ae72b" - integrity sha1-eLySuFuavBW25n7mWCj54hN65ys= - -ndarray-pack@^1.1.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/ndarray-pack/-/ndarray-pack-1.2.1.tgz#8caebeaaa24d5ecf70ff86020637977da8ee585a" - integrity sha1-jK6+qqJNXs9w/4YCBjeXfajuWFo= - dependencies: - cwise-compiler "^1.1.2" - ndarray "^1.0.13" - -ndarray@^1.0.13, ndarray@^1.0.18: - version "1.0.18" - resolved "https://registry.yarnpkg.com/ndarray/-/ndarray-1.0.18.tgz#b60d3a73224ec555d0faa79711e502448fd3f793" - integrity sha1-tg06cyJOxVXQ+qeXEeUCRI/T95M= - dependencies: - iota-array "^1.0.0" - is-buffer "^1.0.2" - -needle@2.6.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.6.0.tgz#24dbb55f2509e2324b4a99d61f413982013ccdbe" - integrity sha512-KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg== - dependencies: - debug "^3.2.6" - iconv-lite "^0.4.4" - sax "^1.2.4" - -needle@^2.3.3: - version "2.4.1" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.1.tgz#14af48732463d7475696f937626b1b993247a56a" - integrity sha512-x/gi6ijr4B7fwl6WYL9FwlCvRQKGlUNvnceho8wxkwXqN8jvVmmmATTmZPRRG7b/yC1eode26C2HO9jl78Du9g== - dependencies: - debug "^3.2.6" - iconv-lite "^0.4.4" - sax "^1.2.4" - -needle@^2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.5.0.tgz#e6fc4b3cc6c25caed7554bd613a5cf0bac8c31c0" - integrity sha512-o/qITSDR0JCyCKEQ1/1bnUXMmznxabbwi/Y4WwJElf+evwJNFNwIDMCCt5IigFVxgeGBJESLohGtIS9gEzo1fA== - dependencies: - debug "^3.2.6" - iconv-lite "^0.4.4" - sax "^1.2.4" - -negotiator@0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" - integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== - -nice-try@^1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" - integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== - -node-bitmap@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/node-bitmap/-/node-bitmap-0.0.1.tgz#180eac7003e0c707618ef31368f62f84b2a69091" - integrity sha1-GA6scAPgxwdhjvMTaPYvhLKmkJE= - -node-gyp@^3.8.0: - version "3.8.0" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c" - integrity sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA== - dependencies: - fstream "^1.0.0" - glob "^7.0.3" - graceful-fs "^4.1.2" - mkdirp "^0.5.0" - nopt "2 || 3" - npmlog "0 || 1 || 2 || 3 || 4" - osenv "0" - request "^2.87.0" - rimraf "2" - semver "~5.3.0" - tar "^2.0.0" - which "1" - -node-releases@^1.1.60: - version "1.1.60" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.60.tgz#6948bdfce8286f0b5d0e5a88e8384e954dfe7084" - integrity sha512-gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA== - -node-releases@^1.1.8: - version "1.1.9" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.9.tgz#70d0985ec4bf7de9f08fc481f5dae111889ca482" - integrity sha512-oic3GT4OtbWWKfRolz5Syw0Xus0KRFxeorLNj0s93ofX6PWyuzKjsiGxsCtWktBwwmTF6DdRRf2KreGqeOk5KA== - dependencies: - semver "^5.3.0" - -node-sass@^4.14.1: - version "4.14.1" - resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.14.1.tgz#99c87ec2efb7047ed638fb4c9db7f3a42e2217b5" - integrity sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g== - dependencies: - async-foreach "^0.1.3" - chalk "^1.1.1" - cross-spawn "^3.0.0" - gaze "^1.0.0" - get-stdin "^4.0.1" - glob "^7.0.3" - in-publish "^2.0.0" - lodash "^4.17.15" - meow "^3.7.0" - mkdirp "^0.5.1" - nan "^2.13.2" - node-gyp "^3.8.0" - npmlog "^4.0.0" - request "^2.88.0" - sass-graph "2.2.5" - stdout-stream "^1.4.0" + "errno" "^0.1.1" + "graceful-fs" "^4.1.2" + "image-size" "~0.5.0" + "mime" "^1.4.1" + "mkdirp" "^0.5.0" + "promise" "^7.1.1" + "request" "^2.83.0" + "source-map" "~0.6.0" + +"lie@~3.3.0": + "integrity" "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==" + "resolved" "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz" + "version" "3.3.0" + dependencies: + "immediate" "~3.0.5" + +"lie@3.1.1": + "integrity" "sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=" + "resolved" "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz" + "version" "3.1.1" + dependencies: + "immediate" "~3.0.5" + +"load-json-file@^1.0.0": + "integrity" "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=" + "resolved" "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz" + "version" "1.1.0" + dependencies: + "graceful-fs" "^4.1.2" + "parse-json" "^2.2.0" + "pify" "^2.0.0" + "pinkie-promise" "^2.0.0" + "strip-bom" "^2.0.0" + +"loader-utils@^0.2.16": + "integrity" "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=" + "resolved" "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz" + "version" "0.2.17" + dependencies: + "big.js" "^3.1.3" + "emojis-list" "^2.0.0" + "json5" "^0.5.0" + "object-assign" "^4.0.1" + +"loadjs@^4.2.0": + "integrity" "sha512-AgQGZisAlTPbTEzrHPb6q+NYBMD+DP9uvGSIjSUM5uG+0jG15cb8axWpxuOIqrmQjn6scaaH8JwloiP27b2KXA==" + "resolved" "https://registry.npmjs.org/loadjs/-/loadjs-4.2.0.tgz" + "version" "4.2.0" + +"localforage@^1.9.0": + "integrity" "sha512-rR1oyNrKulpe+VM9cYmcFn6tsHuokyVHFaCM3+osEmxaHTbEk8oQu6eGDfS6DQLWi/N67XRmB8ECG37OES368g==" + "resolved" "https://registry.npmjs.org/localforage/-/localforage-1.9.0.tgz" + "version" "1.9.0" + dependencies: + "lie" "3.1.1" + +"locate-path@^3.0.0": + "integrity" "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==" + "resolved" "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz" + "version" "3.0.0" + dependencies: + "p-locate" "^3.0.0" + "path-exists" "^3.0.0" + +"lodash._arraymap@^3.0.0": + "integrity" "sha1-Go/Q9MDfS2HeoHbXF83Jfwo8PmY=" + "resolved" "https://registry.npmjs.org/lodash._arraymap/-/lodash._arraymap-3.0.0.tgz" + "version" "3.0.0" + +"lodash._basecallback@^3.0.0": + "integrity" "sha1-t7K7Q9whYEJKIczybFfkQ3cqjic=" + "resolved" "https://registry.npmjs.org/lodash._basecallback/-/lodash._basecallback-3.3.1.tgz" + "version" "3.3.1" + dependencies: + "lodash._baseisequal" "^3.0.0" + "lodash._bindcallback" "^3.0.0" + "lodash.isarray" "^3.0.0" + "lodash.pairs" "^3.0.0" + +"lodash._baseeach@^3.0.0": + "integrity" "sha1-z4cGVyyhROjZ11InyZDamC+TKvM=" + "resolved" "https://registry.npmjs.org/lodash._baseeach/-/lodash._baseeach-3.0.4.tgz" + "version" "3.0.4" + dependencies: + "lodash.keys" "^3.0.0" + +"lodash._baseget@^3.0.0": + "integrity" "sha1-G2rh1frPPCVTI1ChPBGXy4u2dPQ=" + "resolved" "https://registry.npmjs.org/lodash._baseget/-/lodash._baseget-3.7.2.tgz" + "version" "3.7.2" + +"lodash._baseisequal@^3.0.0": + "integrity" "sha1-2AJfdjOdKTQnZ9zIh85cuVpbUfE=" + "resolved" "https://registry.npmjs.org/lodash._baseisequal/-/lodash._baseisequal-3.0.7.tgz" + "version" "3.0.7" + dependencies: + "lodash.isarray" "^3.0.0" + "lodash.istypedarray" "^3.0.0" + "lodash.keys" "^3.0.0" + +"lodash._bindcallback@^3.0.0": + "integrity" "sha1-5THCdkTPi1epnhftlbNcdIeJOS4=" + "resolved" "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz" + "version" "3.0.1" + +"lodash._getnative@^3.0.0": + "integrity" "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=" + "resolved" "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz" + "version" "3.9.1" + +"lodash._topath@^3.0.0": + "integrity" "sha1-PsXiYGAU9MuX91X+aRTt2L/ADqw=" + "resolved" "https://registry.npmjs.org/lodash._topath/-/lodash._topath-3.8.1.tgz" + "version" "3.8.1" + dependencies: + "lodash.isarray" "^3.0.0" + +"lodash.assign@^4.2.0": + "integrity" "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=" + "resolved" "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz" + "version" "4.2.0" + +"lodash.assignin@^4.2.0": + "integrity" "sha1-uo31+4QesKPoBEIysOJjqNxqKKI=" + "resolved" "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz" + "version" "4.2.0" + +"lodash.camelcase@^4.3.0": + "integrity" "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=" + "resolved" "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz" + "version" "4.3.0" + +"lodash.chunk@^4.2.0": + "integrity" "sha1-ZuXOH3btJ7QwPYxlEujRIW6BBrw=" + "resolved" "https://registry.npmjs.org/lodash.chunk/-/lodash.chunk-4.2.0.tgz" + "version" "4.2.0" + +"lodash.clone@^4.5.0": + "integrity" "sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y=" + "resolved" "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.5.0.tgz" + "version" "4.5.0" + +"lodash.clonedeep@^4.3.0", "lodash.clonedeep@^4.5.0": + "integrity" "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=" + "resolved" "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz" + "version" "4.5.0" + +"lodash.constant@^3.0.0": + "integrity" "sha1-v+Bczn5RWzEokl1jYhOEIL1iSRA=" + "resolved" "https://registry.npmjs.org/lodash.constant/-/lodash.constant-3.0.0.tgz" + "version" "3.0.0" + +"lodash.defaults@^4.2.0": + "integrity" "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=" + "resolved" "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz" + "version" "4.2.0" + +"lodash.endswith@^4.2.1": + "integrity" "sha1-/tWawXOO0+I27dcGTsRWRIs3vAk=" + "resolved" "https://registry.npmjs.org/lodash.endswith/-/lodash.endswith-4.2.1.tgz" + "version" "4.2.1" + +"lodash.filter@^4.6.0": + "integrity" "sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4=" + "resolved" "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz" + "version" "4.6.0" + +"lodash.find@^4.6.0": + "integrity" "sha1-ywcE1Hq3F4n/oN6Ll92Sb7iLE7E=" + "resolved" "https://registry.npmjs.org/lodash.find/-/lodash.find-4.6.0.tgz" + "version" "4.6.0" + +"lodash.findindex@^4.6.0": + "integrity" "sha1-oyRd7mH7m24GJLU1ElYku2nBEQY=" + "resolved" "https://registry.npmjs.org/lodash.findindex/-/lodash.findindex-4.6.0.tgz" + "version" "4.6.0" + +"lodash.findkey@^4.6.0": + "integrity" "sha1-gwWOkDtRy7dZ0JzPVG3qPqOcRxg=" + "resolved" "https://registry.npmjs.org/lodash.findkey/-/lodash.findkey-4.6.0.tgz" + "version" "4.6.0" + +"lodash.flatmap@^4.5.0": + "integrity" "sha1-74y/QI9uSCaGYzRTBcaswLd4cC4=" + "resolved" "https://registry.npmjs.org/lodash.flatmap/-/lodash.flatmap-4.5.0.tgz" + "version" "4.5.0" + +"lodash.flatten@^4.4.0": + "integrity" "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=" + "resolved" "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz" + "version" "4.4.0" + +"lodash.flattendeep@^4.4.0": + "integrity" "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=" + "resolved" "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz" + "version" "4.4.0" + +"lodash.foreach@^4.5.0": + "integrity" "sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=" + "resolved" "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz" + "version" "4.5.0" + +"lodash.get@^4.4.2": + "integrity" "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=" + "resolved" "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz" + "version" "4.4.2" + +"lodash.groupby@^4.6.0": + "integrity" "sha1-Cwih3PaDl8OXhVwyOXg4Mt90A9E=" + "resolved" "https://registry.npmjs.org/lodash.groupby/-/lodash.groupby-4.6.0.tgz" + "version" "4.6.0" + +"lodash.has@^4.5.2": + "integrity" "sha1-0Z9NwQlQWMzL4rDN9O4P5Ko3yGI=" + "resolved" "https://registry.npmjs.org/lodash.has/-/lodash.has-4.5.2.tgz" + "version" "4.5.2" + +"lodash.invert@^4.3.0": + "integrity" "sha1-j/4g1LYW9WvqjxqgxuvYDc90Ku4=" + "resolved" "https://registry.npmjs.org/lodash.invert/-/lodash.invert-4.3.0.tgz" + "version" "4.3.0" + +"lodash.isarguments@^3.0.0": + "integrity" "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=" + "resolved" "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz" + "version" "3.1.0" + +"lodash.isarray@^3.0.0": + "integrity" "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=" + "resolved" "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz" + "version" "3.0.4" + +"lodash.isboolean@^3.0.3": + "integrity" "sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY=" + "resolved" "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz" + "version" "3.0.3" + +"lodash.isempty@^4.4.0": + "integrity" "sha1-b4bL7di+TsmHvpqvM8loTbGzHn4=" + "resolved" "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz" + "version" "4.4.0" + +"lodash.isequal@^4.5.0": + "integrity" "sha1-QVxEePK8wwEgwizhDtMib30+GOA=" + "resolved" "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz" + "version" "4.5.0" + +"lodash.isfunction@^3.0.9": + "integrity" "sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw==" + "resolved" "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz" + "version" "3.0.9" + +"lodash.isnumber@^3.0.3": + "integrity" "sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w=" + "resolved" "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz" + "version" "3.0.3" + +"lodash.isobject@^3.0.2": + "integrity" "sha1-PI+41bW/S/kK4G4U8qUwpO2TXh0=" + "resolved" "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz" + "version" "3.0.2" + +"lodash.isplainobject@^4.0.6": + "integrity" "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=" + "resolved" "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz" + "version" "4.0.6" + +"lodash.isstring@^4.0.1": + "integrity" "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=" + "resolved" "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz" + "version" "4.0.1" + +"lodash.istypedarray@^3.0.0": + "integrity" "sha1-yaR3SYYHUB2OhJTSg7h8OSgc72I=" + "resolved" "https://registry.npmjs.org/lodash.istypedarray/-/lodash.istypedarray-3.0.6.tgz" + "version" "3.0.6" + +"lodash.isundefined@^3.0.1": + "integrity" "sha1-I+89lTVWUgOmbO/VuDD4SJEa+0g=" + "resolved" "https://registry.npmjs.org/lodash.isundefined/-/lodash.isundefined-3.0.1.tgz" + "version" "3.0.1" + +"lodash.keys@^3.0.0": + "integrity" "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=" + "resolved" "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz" + "version" "3.1.2" + dependencies: + "lodash._getnative" "^3.0.0" + "lodash.isarguments" "^3.0.0" + "lodash.isarray" "^3.0.0" + +"lodash.keys@^4.2.0": + "integrity" "sha1-oIYCrBLk+4P5H8H7ejYKTZujUgU=" + "resolved" "https://registry.npmjs.org/lodash.keys/-/lodash.keys-4.2.0.tgz" + "version" "4.2.0" + +"lodash.last@^3.0.0": + "integrity" "sha1-JC9mMRLdTG5jcoxgo8kJ0b2tvUw=" + "resolved" "https://registry.npmjs.org/lodash.last/-/lodash.last-3.0.0.tgz" + "version" "3.0.0" + +"lodash.map@^3.0.0": + "integrity" "sha1-tIOs0beGxce0ksSV97UmYim8AMI=" + "resolved" "https://registry.npmjs.org/lodash.map/-/lodash.map-3.1.4.tgz" + "version" "3.1.4" + dependencies: + "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.map@^4.6.0": + "integrity" "sha1-dx7Hg540c9nEzeKLGTlMNWL09tM=" + "resolved" "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz" + "version" "4.6.0" + +"lodash.memoize@^4.1.2": + "integrity" "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=" + "resolved" "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz" + "version" "4.1.2" + +"lodash.merge@^4.6.2": + "integrity" "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" + "resolved" "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz" + "version" "4.6.2" + +"lodash.omit@^4.5.0": + "integrity" "sha1-brGa5aHuHdnfC5aeZs4Lf6MLXmA=" + "resolved" "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz" + "version" "4.5.0" + +"lodash.orderby@^4.6.0": + "integrity" "sha1-5pfwTOXXhSL1TZM4syuBozk+TrM=" + "resolved" "https://registry.npmjs.org/lodash.orderby/-/lodash.orderby-4.6.0.tgz" + "version" "4.6.0" + +"lodash.pairs@^3.0.0": + "integrity" "sha1-u+CNV4bu6qCaFckevw3LfSvjJqk=" + "resolved" "https://registry.npmjs.org/lodash.pairs/-/lodash.pairs-3.0.1.tgz" + "version" "3.0.1" + dependencies: + "lodash.keys" "^3.0.0" + +"lodash.pluck@^3.1.2": + "integrity" "sha1-s0fwN0wBafDusE1nLYnOyGMsIjE=" + "resolved" "https://registry.npmjs.org/lodash.pluck/-/lodash.pluck-3.1.2.tgz" + "version" "3.1.2" + dependencies: + "lodash._baseget" "^3.0.0" + "lodash._topath" "^3.0.0" + "lodash.isarray" "^3.0.0" + "lodash.map" "^3.0.0" + +"lodash.reduce@^4.6.0": + "integrity" "sha1-8atrg5KZrUj3hKu/R2WW8DuRTTs=" + "resolved" "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz" + "version" "4.6.0" + +"lodash.set@^4.3.2": + "integrity" "sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM=" + "resolved" "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz" + "version" "4.3.2" + +"lodash.size@^4.2.0": + "integrity" "sha1-cf517T6r2yvLc6GwtPUcOS7ie4Y=" + "resolved" "https://registry.npmjs.org/lodash.size/-/lodash.size-4.2.0.tgz" + "version" "4.2.0" + +"lodash.sortby@^4.7.0": + "integrity" "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=" + "resolved" "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz" + "version" "4.7.0" + +"lodash.sum@^4.0.2": + "integrity" "sha1-rZDjl5ZdgD1PH/eqWy0Bl/O0Y3s=" + "resolved" "https://registry.npmjs.org/lodash.sum/-/lodash.sum-4.0.2.tgz" + "version" "4.0.2" + +"lodash.topairs@^4.3.0": + "integrity" "sha1-O23qo31g+xFnE8RsXxfqGQ7EjWQ=" + "resolved" "https://registry.npmjs.org/lodash.topairs/-/lodash.topairs-4.3.0.tgz" + "version" "4.3.0" + +"lodash.transform@^4.6.0": + "integrity" "sha1-EjBkIvYzJK7YSD0/ODMrX2cFR6A=" + "resolved" "https://registry.npmjs.org/lodash.transform/-/lodash.transform-4.6.0.tgz" + "version" "4.6.0" + +"lodash.union@^4.6.0": + "integrity" "sha1-SLtQiECfFvGCFmZkHETdGqrjzYg=" + "resolved" "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz" + "version" "4.6.0" + +"lodash.uniq@^4.5.0": + "integrity" "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=" + "resolved" "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz" + "version" "4.5.0" + +"lodash.upperfirst@^4.3.1": + "integrity" "sha1-E2Xt9DFIBIHvDRxolXpe2Z1J984=" + "resolved" "https://registry.npmjs.org/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz" + "version" "4.3.1" + +"lodash.values@^4.3.0": + "integrity" "sha1-o6bCsOvsxcLLocF+bmIP6BtT00c=" + "resolved" "https://registry.npmjs.org/lodash.values/-/lodash.values-4.3.0.tgz" + "version" "4.3.0" + +"lodash@^4.0.0", "lodash@^4.17.11", "lodash@^4.17.14", "lodash@^4.17.15", "lodash@^4.17.4", "lodash@^4.17.5", "lodash@~4.17.10": + "integrity" "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==" + "resolved" "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz" + "version" "4.17.20" + +"log-symbols@^4.0.0": + "integrity" "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==" + "resolved" "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz" + "version" "4.1.0" + dependencies: + "chalk" "^4.1.0" + "is-unicode-supported" "^0.1.0" + +"logform@^2.2.0": + "integrity" "sha512-N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg==" + "resolved" "https://registry.npmjs.org/logform/-/logform-2.2.0.tgz" + "version" "2.2.0" + dependencies: + "colors" "^1.2.1" + "fast-safe-stringify" "^2.0.4" + "fecha" "^4.2.0" + "ms" "^2.1.1" + "triple-beam" "^1.3.0" + +"loud-rejection@^1.0.0": + "integrity" "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=" + "resolved" "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz" + "version" "1.6.0" + dependencies: + "currently-unhandled" "^0.4.1" + "signal-exit" "^3.0.0" + +"lowercase-keys@^1.0.0", "lowercase-keys@^1.0.1": + "integrity" "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==" + "resolved" "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz" + "version" "1.0.1" + +"lowercase-keys@^2.0.0": + "integrity" "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==" + "resolved" "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz" + "version" "2.0.0" + +"lru-cache@^4.0.0", "lru-cache@^4.0.1", "lru-cache@^4.1.2": + "integrity" "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==" + "resolved" "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz" + "version" "4.1.5" + dependencies: + "pseudomap" "^1.0.2" + "yallist" "^2.1.2" + +"lru-cache@^5.1.1": + "integrity" "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==" + "resolved" "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz" + "version" "5.1.1" + dependencies: + "yallist" "^3.0.2" + +"lru-cache@^6.0.0": + "integrity" "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==" + "resolved" "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz" + "version" "6.0.0" + dependencies: + "yallist" "^4.0.0" + +"macos-release@^2.2.0": + "integrity" "sha512-OHhSbtcviqMPt7yfw5ef5aghS2jzFVKEFyCJndQt2YpSQ9qRVSEv2axSJI1paVThEu+FFGs584h/1YhxjVqajA==" + "resolved" "https://registry.npmjs.org/macos-release/-/macos-release-2.3.0.tgz" + "version" "2.3.0" + +"magic-string@^0.22.4": + "integrity" "sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==" + "resolved" "https://registry.npmjs.org/magic-string/-/magic-string-0.22.5.tgz" + "version" "0.22.5" + dependencies: + "vlq" "^0.2.2" + +"magic-string@^0.25.1": + "integrity" "sha512-iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg==" + "resolved" "https://registry.npmjs.org/magic-string/-/magic-string-0.25.2.tgz" + "version" "0.25.2" + dependencies: + "sourcemap-codec" "^1.4.4" + +"make-dir@^3.0.0": + "integrity" "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==" + "resolved" "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz" + "version" "3.1.0" + dependencies: + "semver" "^6.0.0" + +"map-age-cleaner@^0.1.1": + "integrity" "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==" + "resolved" "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz" + "version" "0.1.3" + dependencies: + "p-defer" "^1.0.0" + +"map-cache@^0.2.2": + "integrity" "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=" + "resolved" "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz" + "version" "0.2.2" + +"map-obj@^1.0.0", "map-obj@^1.0.1": + "integrity" "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=" + "resolved" "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz" + "version" "1.0.1" + +"map-visit@^1.0.0": + "integrity" "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=" + "resolved" "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz" + "version" "1.0.0" + dependencies: + "object-visit" "^1.0.0" + +"matched@^1.0.2": + "integrity" "sha512-7ivM1jFZVTOOS77QsR+TtYHH0ecdLclMkqbf5qiJdX2RorqfhsL65QHySPZgDE0ZjHoh+mQUNHTanNXIlzXd0Q==" + "resolved" "https://registry.npmjs.org/matched/-/matched-1.0.2.tgz" + "version" "1.0.2" + dependencies: + "arr-union" "^3.1.0" + "async-array-reduce" "^0.2.1" + "glob" "^7.1.2" + "has-glob" "^1.0.0" + "is-valid-glob" "^1.0.0" + "resolve-dir" "^1.0.0" + +"matcher@^3.0.0": + "integrity" "sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==" + "resolved" "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz" + "version" "3.0.0" + dependencies: + "escape-string-regexp" "^4.0.0" + +"mdn-data@~1.1.0": + "integrity" "sha512-FSYbp3lyKjyj3E7fMl6rYvUdX0FBXaluGqlFoYESWQlyUTq8R+wp0rkFxoYFqZlHCvsUXGjyJmLQSnXToYhOSA==" + "resolved" "https://registry.npmjs.org/mdn-data/-/mdn-data-1.1.4.tgz" + "version" "1.1.4" + +"mdn-data@2.0.4": + "integrity" "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==" + "resolved" "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz" + "version" "2.0.4" + +"mdn-data@2.0.6": + "integrity" "sha512-rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA==" + "resolved" "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.6.tgz" + "version" "2.0.6" + +"media-typer@0.3.0": + "integrity" "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" + "resolved" "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz" + "version" "0.3.0" + +"mem@^4.0.0": + "integrity" "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==" + "resolved" "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz" + "version" "4.3.0" + dependencies: + "map-age-cleaner" "^0.1.1" + "mimic-fn" "^2.0.0" + "p-is-promise" "^2.0.0" + +"meow@^3.7.0": + "integrity" "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=" + "resolved" "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz" + "version" "3.7.0" + dependencies: + "camelcase-keys" "^2.0.0" + "decamelize" "^1.1.2" + "loud-rejection" "^1.0.0" + "map-obj" "^1.0.1" + "minimist" "^1.1.3" + "normalize-package-data" "^2.3.4" + "object-assign" "^4.0.1" + "read-pkg-up" "^1.0.1" + "redent" "^1.0.0" + "trim-newlines" "^1.0.0" + +"merge-descriptors@1.0.1": + "integrity" "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=" + "resolved" "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz" + "version" "1.0.1" + +"merge-source-map@^1.1.0": + "integrity" "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==" + "resolved" "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz" + "version" "1.1.0" + dependencies: + "source-map" "^0.6.1" + +"merge-stream@^1.0.1": + "integrity" "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=" + "resolved" "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz" + "version" "1.0.1" + dependencies: + "readable-stream" "^2.0.1" + +"merge2@^1.3.0": + "integrity" "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==" + "resolved" "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz" + "version" "1.4.1" + +"methods@^1.1.1", "methods@~1.1.2": + "integrity" "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=" + "resolved" "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz" + "version" "1.1.2" + +"micromatch@^3.1.10": + "integrity" "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==" + "resolved" "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz" + "version" "3.1.10" + dependencies: + "arr-diff" "^4.0.0" + "array-unique" "^0.3.2" + "braces" "^2.3.1" + "define-property" "^2.0.2" + "extend-shallow" "^3.0.2" + "extglob" "^2.0.4" + "fragment-cache" "^0.2.1" + "kind-of" "^6.0.2" + "nanomatch" "^1.2.9" + "object.pick" "^1.3.0" + "regex-not" "^1.0.0" + "snapdragon" "^0.8.1" + "to-regex" "^3.0.2" + +"micromatch@^4.0.2", "micromatch@4.0.2": + "integrity" "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==" + "resolved" "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz" + "version" "4.0.2" + dependencies: + "braces" "^3.0.1" + "picomatch" "^2.0.5" + +"mime-db@1.40.0": + "integrity" "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==" + "resolved" "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz" + "version" "1.40.0" + +"mime-db@1.43.0": + "integrity" "sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==" + "resolved" "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz" + "version" "1.43.0" + +"mime-db@1.44.0": + "integrity" "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==" + "resolved" "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz" + "version" "1.44.0" + +"mime-types@^2.0.1": + "integrity" "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==" + "resolved" "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz" + "version" "2.1.24" + dependencies: + "mime-db" "1.40.0" + +"mime-types@^2.1.12", "mime-types@~2.1.19": + "integrity" "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==" + "resolved" "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz" + "version" "2.1.27" + dependencies: + "mime-db" "1.44.0" + +"mime-types@~2.1.24": + "integrity" "sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==" + "resolved" "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz" + "version" "2.1.26" + dependencies: + "mime-db" "1.43.0" + +"mime@^1.4.1", "mime@1.6.0": + "integrity" "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" + "resolved" "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz" + "version" "1.6.0" + +"mimic-fn@^2.0.0", "mimic-fn@^2.1.0": + "integrity" "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" + "resolved" "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz" + "version" "2.1.0" + +"mimic-response@^1.0.0", "mimic-response@^1.0.1": + "integrity" "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==" + "resolved" "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz" + "version" "1.0.1" + +"mimic-response@^3.1.0": + "integrity" "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==" + "resolved" "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz" + "version" "3.1.0" + +"minimatch@^3.0.4", "minimatch@~3.0.2", "minimatch@3.0.4": + "integrity" "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==" + "resolved" "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz" + "version" "3.0.4" + dependencies: + "brace-expansion" "^1.1.7" + +"minimist@^1.1.3", "minimist@^1.2.5": + "integrity" "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" + "resolved" "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz" + "version" "1.2.5" + +"minimist@^1.2.0": + "integrity" "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" + "resolved" "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz" + "version" "1.2.0" + +"minimist@0.0.8": + "integrity" "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" + "resolved" "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz" + "version" "0.0.8" + +"minipass@^3.0.0": + "integrity" "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==" + "resolved" "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz" + "version" "3.1.3" + dependencies: + "yallist" "^4.0.0" + +"minizlib@^2.1.1": + "integrity" "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==" + "resolved" "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz" + "version" "2.1.2" + dependencies: + "minipass" "^3.0.0" + "yallist" "^4.0.0" + +"mixin-deep@^1.2.0": + "integrity" "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==" + "resolved" "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz" + "version" "1.3.2" + dependencies: + "for-in" "^1.0.2" + "is-extendable" "^1.0.1" + +"mkdirp@^0.5.0", "mkdirp@^0.5.1", "mkdirp@^0.5.4", "mkdirp@>=0.5 0": + "integrity" "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==" + "resolved" "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz" + "version" "0.5.5" + dependencies: + "minimist" "^1.2.5" + +"mkdirp@^1.0.3": + "integrity" "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" + "resolved" "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz" + "version" "1.0.4" + +"mkdirp@^1.0.4": + "integrity" "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" + "resolved" "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz" + "version" "1.0.4" + +"mkdirp@~0.5.1": + "integrity" "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=" + "resolved" "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz" + "version" "0.5.1" + dependencies: + "minimist" "0.0.8" + +"mkdirp@0.5.1": + "integrity" "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=" + "resolved" "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz" + "version" "0.5.1" + dependencies: + "minimist" "0.0.8" + +"mocha@^5.2.0": + "integrity" "sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==" + "resolved" "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz" + "version" "5.2.0" + dependencies: + "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" + +"moment-timezone@^0.5.28": + "integrity" "sha512-TDJkZvAyKIVWg5EtVqRzU97w0Rb0YVbfpqyjgu6GwXCAohVRqwZjf4fOzDE6p1Ch98Sro/8hQQi65WDXW5STPw==" + "resolved" "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.28.tgz" + "version" "0.5.28" + dependencies: + "moment" ">= 2.9.0" + +"moment@^2.20.1", "moment@>= 2.9.0": + "integrity" "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==" + "resolved" "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz" + "version" "2.24.0" + +"ms@^2.1.1", "ms@2.1.2": + "integrity" "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + "resolved" "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz" + "version" "2.1.2" + +"ms@2.0.0": + "integrity" "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + "resolved" "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz" + "version" "2.0.0" + +"ms@2.1.1": + "integrity" "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" + "resolved" "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz" + "version" "2.1.1" + +"mustache@^3.0.0": + "integrity" "sha512-RERvMFdLpaFfSRIEe632yDm5nsd0SDKn8hGmcUwswnyiE5mtdZLDybtHAz6hjJhawokF0hXvGLtx9mrQfm6FkA==" + "resolved" "https://registry.npmjs.org/mustache/-/mustache-3.2.1.tgz" + "version" "3.2.1" + +"mute-stream@0.0.8": + "integrity" "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==" + "resolved" "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz" + "version" "0.0.8" + +"nan@^2.13.2": + "integrity" "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==" + "resolved" "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz" + "version" "2.14.1" + +"nanomatch@^1.2.9": + "integrity" "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==" + "resolved" "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz" + "version" "1.2.13" + dependencies: + "arr-diff" "^4.0.0" + "array-unique" "^0.3.2" + "define-property" "^2.0.2" + "extend-shallow" "^3.0.2" + "fragment-cache" "^0.2.1" + "is-windows" "^1.0.2" + "kind-of" "^6.0.2" + "object.pick" "^1.3.0" + "regex-not" "^1.0.0" + "snapdragon" "^0.8.1" + "to-regex" "^3.0.1" + +"ndarray-linear-interpolate@^1.0.0": + "integrity" "sha1-eLySuFuavBW25n7mWCj54hN65ys=" + "resolved" "https://registry.npmjs.org/ndarray-linear-interpolate/-/ndarray-linear-interpolate-1.0.0.tgz" + "version" "1.0.0" + +"ndarray-pack@^1.1.1": + "integrity" "sha1-jK6+qqJNXs9w/4YCBjeXfajuWFo=" + "resolved" "https://registry.npmjs.org/ndarray-pack/-/ndarray-pack-1.2.1.tgz" + "version" "1.2.1" + dependencies: + "cwise-compiler" "^1.1.2" + "ndarray" "^1.0.13" + +"ndarray@^1.0.13", "ndarray@^1.0.18": + "integrity" "sha1-tg06cyJOxVXQ+qeXEeUCRI/T95M=" + "resolved" "https://registry.npmjs.org/ndarray/-/ndarray-1.0.18.tgz" + "version" "1.0.18" + dependencies: + "iota-array" "^1.0.0" + "is-buffer" "^1.0.2" + +"needle@^2.3.3": + "integrity" "sha512-x/gi6ijr4B7fwl6WYL9FwlCvRQKGlUNvnceho8wxkwXqN8jvVmmmATTmZPRRG7b/yC1eode26C2HO9jl78Du9g==" + "resolved" "https://registry.npmjs.org/needle/-/needle-2.4.1.tgz" + "version" "2.4.1" + dependencies: + "debug" "^3.2.6" + "iconv-lite" "^0.4.4" + "sax" "^1.2.4" + +"needle@^2.5.0": + "integrity" "sha512-o/qITSDR0JCyCKEQ1/1bnUXMmznxabbwi/Y4WwJElf+evwJNFNwIDMCCt5IigFVxgeGBJESLohGtIS9gEzo1fA==" + "resolved" "https://registry.npmjs.org/needle/-/needle-2.5.0.tgz" + "version" "2.5.0" + dependencies: + "debug" "^3.2.6" + "iconv-lite" "^0.4.4" + "sax" "^1.2.4" + +"needle@2.6.0": + "integrity" "sha512-KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg==" + "resolved" "https://registry.npmjs.org/needle/-/needle-2.6.0.tgz" + "version" "2.6.0" + dependencies: + "debug" "^3.2.6" + "iconv-lite" "^0.4.4" + "sax" "^1.2.4" + +"negotiator@0.6.2": + "integrity" "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==" + "resolved" "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz" + "version" "0.6.2" + +"nice-try@^1.0.4": + "integrity" "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==" + "resolved" "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz" + "version" "1.0.5" + +"node-bitmap@0.0.1": + "integrity" "sha1-GA6scAPgxwdhjvMTaPYvhLKmkJE=" + "resolved" "https://registry.npmjs.org/node-bitmap/-/node-bitmap-0.0.1.tgz" + "version" "0.0.1" + +"node-gyp@^3.8.0": + "integrity" "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==" + "resolved" "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz" + "version" "3.8.0" + dependencies: + "fstream" "^1.0.0" + "glob" "^7.0.3" + "graceful-fs" "^4.1.2" + "mkdirp" "^0.5.0" + "nopt" "2 || 3" + "npmlog" "0 || 1 || 2 || 3 || 4" + "osenv" "0" + "request" "^2.87.0" + "rimraf" "2" + "semver" "~5.3.0" + "tar" "^2.0.0" + "which" "1" + +"node-releases@^1.1.60": + "integrity" "sha512-gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA==" + "resolved" "https://registry.npmjs.org/node-releases/-/node-releases-1.1.60.tgz" + "version" "1.1.60" + +"node-releases@^1.1.8": + "integrity" "sha512-oic3GT4OtbWWKfRolz5Syw0Xus0KRFxeorLNj0s93ofX6PWyuzKjsiGxsCtWktBwwmTF6DdRRf2KreGqeOk5KA==" + "resolved" "https://registry.npmjs.org/node-releases/-/node-releases-1.1.9.tgz" + "version" "1.1.9" + dependencies: + "semver" "^5.3.0" + +"node-sass@^4.14.1": + "integrity" "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==" + "resolved" "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz" + "version" "4.14.1" + dependencies: + "async-foreach" "^0.1.3" + "chalk" "^1.1.1" + "cross-spawn" "^3.0.0" + "gaze" "^1.0.0" + "get-stdin" "^4.0.1" + "glob" "^7.0.3" + "in-publish" "^2.0.0" + "lodash" "^4.17.15" + "meow" "^3.7.0" + "mkdirp" "^0.5.1" + "nan" "^2.13.2" + "node-gyp" "^3.8.0" + "npmlog" "^4.0.0" + "request" "^2.88.0" + "sass-graph" "2.2.5" + "stdout-stream" "^1.4.0" "true-case-path" "^1.0.2" +"nopt@~1.0.10": + "integrity" "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=" + "resolved" "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz" + "version" "1.0.10" + dependencies: + "abbrev" "1" + "nopt@2 || 3": - version "3.0.6" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" - integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k= - dependencies: - abbrev "1" - -nopt@~1.0.10: - version "1.0.10" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee" - integrity sha1-bd0hvSoxQXuScn3Vhfim83YI6+4= - dependencies: - abbrev "1" - -normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: - version "2.5.0" - resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" - integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== - dependencies: - hosted-git-info "^2.1.4" - resolve "^1.10.0" - semver "2 || 3 || 4 || 5" - validate-npm-package-license "^3.0.1" - -normalize-range@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" - integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI= - -normalize-url@^3.0.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559" - integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg== - -normalize-url@^4.1.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.0.tgz#453354087e6ca96957bd8f5baf753f5982142129" - integrity sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ== - -npm-run-path@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" - integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8= - dependencies: - path-key "^2.0.0" - -"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0: - version "4.1.2" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" - integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== - dependencies: - are-we-there-yet "~1.1.2" - console-control-strings "~1.1.0" - gauge "~2.7.3" - set-blocking "~2.0.0" - -nth-check@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" - integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg== - dependencies: - boolbase "~1.0.0" - -num2fraction@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede" - integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4= - -number-is-nan@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" - integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= - -oauth-sign@~0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" - integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== - -object-assign@^4.0.1, object-assign@^4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= - -object-copy@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" - integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw= - dependencies: - copy-descriptor "^0.1.0" - define-property "^0.2.5" - kind-of "^3.0.3" - -object-hash@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.0.3.tgz#d12db044e03cd2ca3d77c0570d87225b02e1e6ea" - integrity sha512-JPKn0GMu+Fa3zt3Bmr66JhokJU5BaNBIh4ZeTlaCBzrBsOeXzwcKKAK1tbLiPKgvwmPXsDvvLHoWh5Bm7ofIYg== - -object-inspect@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67" - integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw== - -object-is@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.2.tgz#c5d2e87ff9e119f78b7a088441519e2eec1573b6" - integrity sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ== - dependencies: - define-properties "^1.1.3" - es-abstract "^1.17.5" - -object-keys@^1.0.11, object-keys@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" - integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== - -object-keys@^1.0.12: - version "1.1.0" - resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.0.tgz#11bd22348dd2e096a045ab06f6c85bcc340fa032" - integrity sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg== - -object-visit@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" - integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs= - dependencies: - isobject "^3.0.0" - -object.assign@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da" - integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w== - dependencies: - define-properties "^1.1.2" - function-bind "^1.1.1" - has-symbols "^1.0.0" - object-keys "^1.0.11" - -object.getownpropertydescriptors@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16" - integrity sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY= - dependencies: - define-properties "^1.1.2" - es-abstract "^1.5.1" - -object.pick@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" - integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c= - dependencies: - isobject "^3.0.1" - -object.values@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.0.tgz#bf6810ef5da3e5325790eaaa2be213ea84624da9" - integrity sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg== - dependencies: - define-properties "^1.1.3" - es-abstract "^1.12.0" - function-bind "^1.1.1" - has "^1.0.3" - -omggif@^1.0.5: - version "1.0.10" - resolved "https://registry.yarnpkg.com/omggif/-/omggif-1.0.10.tgz#ddaaf90d4a42f532e9e7cb3a95ecdd47f17c7b19" - integrity sha512-LMJTtvgc/nugXj0Vcrrs68Mn2D1r0zf630VNtqtpI1FEO7e+O9FP4gqs9AcnBaSEeoHIPm28u6qgPR0oyEpGSw== - -on-finished@~2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" - integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= - dependencies: - ee-first "1.1.1" - -once@^1.3.0, once@^1.3.1, once@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= - dependencies: - wrappy "1" - -one-time@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/one-time/-/one-time-1.0.0.tgz#e06bc174aed214ed58edede573b433bbf827cb45" - integrity sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g== - dependencies: - fn.name "1.x.x" - -onetime@^5.1.0: - version "5.1.2" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" - integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== - dependencies: - mimic-fn "^2.1.0" - -open@^7.0.3: - version "7.0.3" - resolved "https://registry.yarnpkg.com/open/-/open-7.0.3.tgz#db551a1af9c7ab4c7af664139930826138531c48" - integrity sha512-sP2ru2v0P290WFfv49Ap8MF6PkzGNnGlAwHweB4WR4mr5d2d0woiCluUeJ218w7/+PmoBy9JmYgD5A4mLcWOFA== - dependencies: - is-docker "^2.0.0" - is-wsl "^2.1.1" - -ora@5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/ora/-/ora-5.3.0.tgz#fb832899d3a1372fe71c8b2c534bbfe74961bb6f" - integrity sha512-zAKMgGXUim0Jyd6CXK9lraBnD3H5yPGBPPOkC23a2BG6hsm4Zu6OQSjQuEtV0BHDf4aKHcUFvJiGRrFuW3MG8g== - dependencies: - bl "^4.0.3" - chalk "^4.1.0" - cli-cursor "^3.1.0" - cli-spinners "^2.5.0" - is-interactive "^1.0.0" - log-symbols "^4.0.0" - strip-ansi "^6.0.0" - wcwidth "^1.0.1" - -os-homedir@^1.0.0, os-homedir@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" - integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M= - -os-locale@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a" - integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q== - dependencies: - execa "^1.0.0" - lcid "^2.0.0" - mem "^4.0.0" - -os-name@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/os-name/-/os-name-3.1.0.tgz#dec19d966296e1cd62d701a5a66ee1ddeae70801" - integrity sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg== - dependencies: - macos-release "^2.2.0" - windows-release "^3.1.0" - -os-tmpdir@^1.0.0, os-tmpdir@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" - integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= - -osenv@0: - version "0.1.5" - resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" - integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== - dependencies: - os-homedir "^1.0.0" - os-tmpdir "^1.0.0" - -p-cancelable@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" - integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw== - -p-cancelable@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.0.0.tgz#4a3740f5bdaf5ed5d7c3e34882c6fb5d6b266a6e" - integrity sha512-wvPXDmbMmu2ksjkB4Z3nZWTSkJEb9lqVdMaCKpZUGJG9TMiNp9XcbG3fn9fPKjem04fJMJnXoyFPk2FmgiaiNg== - -p-defer@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c" - integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww= - -p-finally@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" - integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= - -p-is-promise@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e" - integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg== - -p-limit@^2.0.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" - integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== - dependencies: - p-try "^2.0.0" - -p-locate@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" - integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ== - dependencies: - p-limit "^2.0.0" - -p-map@2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175" - integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw== - -p-map@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" - integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== - dependencies: - aggregate-error "^3.0.0" - -p-queue@^2.4.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/p-queue/-/p-queue-2.4.2.tgz#03609826682b743be9a22dba25051bd46724fc34" - integrity sha512-n8/y+yDJwBjoLQe1GSJbbaYQLTI7QHNZI2+rpmCDbe++WLf9HC3gf6iqj5yfPAV71W4UF3ql5W1+UBPXoXTxng== - -p-try@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" - integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== - -package-json@^6.3.0: - version "6.5.0" - resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0" - integrity sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ== - dependencies: - got "^9.6.0" - registry-auth-token "^4.0.0" - registry-url "^5.0.0" - semver "^6.2.0" - -pako@~0.2.0: - version "0.2.9" - resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75" - integrity sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU= - -pako@~1.0.2: - version "1.0.11" - resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf" - integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw== - -parchment@2.0.0-dev.2: - version "2.0.0-dev.2" - resolved "https://registry.yarnpkg.com/parchment/-/parchment-2.0.0-dev.2.tgz#9d6fe57b3721317bd1c481ea38ffa9b287d496b8" - integrity sha512-4fgRny4pPISoML08Zp7poi52Dff3E2G1ORTi2D/acJ/RiROdDAMDB6VcQNfBcmehrX5Wixp6dxh6JjLyE5yUNQ== - -parchment@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/parchment/-/parchment-1.1.4.tgz#aeded7ab938fe921d4c34bc339ce1168bc2ffde5" - integrity sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg== - -parse-data-uri@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/parse-data-uri/-/parse-data-uri-0.2.0.tgz#bf04d851dd5c87b0ab238e5d01ace494b604b4c9" - integrity sha1-vwTYUd1ch7CrI45dAazklLYEtMk= - dependencies: - data-uri-to-buffer "0.0.3" - -parse-json@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9" - integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck= - dependencies: - error-ex "^1.2.0" - -parse-json@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0" - integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA= - dependencies: - error-ex "^1.3.1" - json-parse-better-errors "^1.0.1" - -parse-link-header@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/parse-link-header/-/parse-link-header-1.0.1.tgz#bedfe0d2118aeb84be75e7b025419ec8a61140a7" - integrity sha1-vt/g0hGK64S+deewJUGeyKYRQKc= - dependencies: - xtend "~4.0.1" - -parse-passwd@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" - integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY= - -parseqs@0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz#8e4bb5a19d1cdc844a08ac974d34e273afa670d5" - integrity sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w== - -parseuri@0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.6.tgz#e1496e829e3ac2ff47f39a4dd044b32823c4a25a" - integrity sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow== - -parseurl@~1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" - integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== - -pascalcase@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" - integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ= - -path-exists@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b" - integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s= - dependencies: - pinkie-promise "^2.0.0" - -path-exists@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" - integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= - -path-is-absolute@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= - -path-key@^2.0.0, path-key@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" - integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= - -path-parse@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" - integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== - -path-to-regexp@0.1.7: - version "0.1.7" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" - integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= - -path-type@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441" - integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE= - dependencies: - graceful-fs "^4.1.2" - pify "^2.0.0" - pinkie-promise "^2.0.0" - -peek-stream@^1.1.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/peek-stream/-/peek-stream-1.1.3.tgz#3b35d84b7ccbbd262fff31dc10da56856ead6d67" - integrity sha512-FhJ+YbOSBb9/rIl2ZeE/QHEsWn7PqNYt8ARAY3kIgNGOk13g9FGyIY6JIl/xB/3TFRVoTv5as0l11weORrTekA== - dependencies: - buffer-from "^1.0.0" - duplexify "^3.5.0" - through2 "^2.0.3" - -pend@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" - integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA= - -performance-now@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" - integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= - -phantomjs-prebuilt@^2.1.16: - version "2.1.16" - resolved "https://registry.yarnpkg.com/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.16.tgz#efd212a4a3966d3647684ea8ba788549be2aefef" - integrity sha1-79ISpKOWbTZHaE6ouniFSb4q7+8= - dependencies: - 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" - -picomatch@^2.0.5, picomatch@^2.2.1: - version "2.2.2" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" - integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== - -pify@^2.0.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" - integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw= - -pify@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" - integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= - -pinkie-promise@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" - integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o= - dependencies: - pinkie "^2.0.0" - -pinkie@^2.0.0: - version "2.0.4" - resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" - integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA= - -plyr@^3.6.2: - version "3.6.2" - resolved "https://registry.yarnpkg.com/plyr/-/plyr-3.6.2.tgz#5a55b608acd161262de1cc75ca843aa64355a051" - integrity sha512-CjAhRDtzyGqMRte9Phj4FsZFegS9VxW60boOhQsAnZHuiFG3yVBRcodWsGZ79GuXHHelc4DxMHO+z0QggY+9qQ== - dependencies: - core-js "^3.6.5" - custom-event-polyfill "^1.0.7" - loadjs "^4.2.0" - rangetouch "^2.0.1" - url-polyfill "^1.1.8" - -pngjs@^3.3.3: - version "3.4.0" - resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f" - integrity sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w== - -posix-character-classes@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" - integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= - -postcss-calc@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.1.tgz#36d77bab023b0ecbb9789d84dcb23c4941145436" - integrity sha512-oXqx0m6tb4N3JGdmeMSc/i91KppbYsFZKdH0xMOqK8V1rJlzrKlTdokz8ozUXLVejydRN6u2IddxpcijRj2FqQ== - dependencies: - css-unit-converter "^1.1.1" - postcss "^7.0.5" - postcss-selector-parser "^5.0.0-rc.4" - postcss-value-parser "^3.3.1" - -postcss-colormin@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-4.0.3.tgz#ae060bce93ed794ac71264f08132d550956bd381" - integrity sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw== - dependencies: - browserslist "^4.0.0" - color "^3.0.0" - has "^1.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" - -postcss-convert-values@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz#ca3813ed4da0f812f9d43703584e449ebe189a7f" - integrity sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ== - dependencies: - postcss "^7.0.0" - postcss-value-parser "^3.0.0" - -postcss-discard-comments@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz#1fbabd2c246bff6aaad7997b2b0918f4d7af4033" - integrity sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg== - dependencies: - postcss "^7.0.0" - -postcss-discard-duplicates@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz#3fe133cd3c82282e550fc9b239176a9207b784eb" - integrity sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ== - dependencies: - postcss "^7.0.0" - -postcss-discard-empty@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz#c8c951e9f73ed9428019458444a02ad90bb9f765" - integrity sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w== - dependencies: - postcss "^7.0.0" - -postcss-discard-overridden@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz#652aef8a96726f029f5e3e00146ee7a4e755ff57" - integrity sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg== - dependencies: - postcss "^7.0.0" - -postcss-load-config@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.0.0.tgz#f1312ddbf5912cd747177083c5ef7a19d62ee484" - integrity sha512-V5JBLzw406BB8UIfsAWSK2KSwIJ5yoEIVFb4gVkXci0QdKgA24jLmHZ/ghe/GgX0lJ0/D1uUK1ejhzEY94MChQ== - dependencies: - cosmiconfig "^4.0.0" - import-cwd "^2.0.0" - -postcss-merge-longhand@^4.0.11: - version "4.0.11" - resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz#62f49a13e4a0ee04e7b98f42bb16062ca2549e24" - integrity sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw== - dependencies: - css-color-names "0.0.4" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" - stylehacks "^4.0.0" - -postcss-merge-rules@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz#362bea4ff5a1f98e4075a713c6cb25aefef9a650" - integrity sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ== - dependencies: - browserslist "^4.0.0" - caniuse-api "^3.0.0" - cssnano-util-same-parent "^4.0.0" - postcss "^7.0.0" - postcss-selector-parser "^3.0.0" - vendors "^1.0.0" - -postcss-minify-font-values@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz#cd4c344cce474343fac5d82206ab2cbcb8afd5a6" - integrity sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg== - dependencies: - postcss "^7.0.0" - postcss-value-parser "^3.0.0" - -postcss-minify-gradients@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz#93b29c2ff5099c535eecda56c4aa6e665a663471" - integrity sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q== - dependencies: - cssnano-util-get-arguments "^4.0.0" - is-color-stop "^1.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" - -postcss-minify-params@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz#6b9cef030c11e35261f95f618c90036d680db874" - integrity sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg== - dependencies: - alphanum-sort "^1.0.0" - browserslist "^4.0.0" - cssnano-util-get-arguments "^4.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" - uniqs "^2.0.0" - -postcss-minify-selectors@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz#e2e5eb40bfee500d0cd9243500f5f8ea4262fbd8" - integrity sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g== - dependencies: - alphanum-sort "^1.0.0" - has "^1.0.0" - postcss "^7.0.0" - postcss-selector-parser "^3.0.0" - -postcss-modules-extract-imports@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz#b614c9720be6816eaee35fb3a5faa1dba6a05ddb" - integrity sha1-thTJcgvmgW6u41+zpfqh26agXds= - dependencies: - postcss "^6.0.1" - -postcss-modules-local-by-default@1.2.0, postcss-modules-local-by-default@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069" - integrity sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk= - dependencies: - css-selector-tokenizer "^0.7.0" - postcss "^6.0.1" - -postcss-modules-scope@1.1.0, postcss-modules-scope@^1.0.2: - version "1.1.0" - resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90" - integrity sha1-1upkmUx5+XtipytCb75gVqGUu5A= - dependencies: - css-selector-tokenizer "^0.7.0" - postcss "^6.0.1" - -postcss-modules-sync@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-sync/-/postcss-modules-sync-1.0.0.tgz#619a719cf78dd16a4834135140b324cf77334be1" - integrity sha1-YZpxnPeN0WpINBNRQLMkz3czS+E= - dependencies: - generic-names "^1.0.2" - icss-replace-symbols "^1.0.2" - postcss "^5.2.5" - postcss-modules-local-by-default "^1.1.1" - postcss-modules-scope "^1.0.2" - string-hash "^1.1.0" - -postcss-modules-values@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20" - integrity sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA= - dependencies: - icss-replace-symbols "^1.1.0" - postcss "^6.0.1" - -postcss-modules@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/postcss-modules/-/postcss-modules-1.4.1.tgz#8aa35bd3461db67e27377a7ce770d77b654a84ef" - integrity sha512-btTrbK+Xc3NBuYF8TPBjCMRSp5h6NoQ1iVZ6WiDQENIze6KIYCSf0+UFQuV3yJ7gRHA+4AAtF8i2jRvUpbBMMg== - dependencies: - css-modules-loader-core "^1.1.0" - generic-names "^1.0.3" - lodash.camelcase "^4.3.0" - postcss "^7.0.1" - string-hash "^1.1.1" - -postcss-normalize-charset@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz#8b35add3aee83a136b0471e0d59be58a50285dd4" - integrity sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g== - dependencies: - postcss "^7.0.0" - -postcss-normalize-display-values@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz#0dbe04a4ce9063d4667ed2be476bb830c825935a" - integrity sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ== - dependencies: - cssnano-util-get-match "^4.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" - -postcss-normalize-positions@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz#05f757f84f260437378368a91f8932d4b102917f" - integrity sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA== - dependencies: - cssnano-util-get-arguments "^4.0.0" - has "^1.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" - -postcss-normalize-repeat-style@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz#c4ebbc289f3991a028d44751cbdd11918b17910c" - integrity sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q== - dependencies: - cssnano-util-get-arguments "^4.0.0" - cssnano-util-get-match "^4.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" - -postcss-normalize-string@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz#cd44c40ab07a0c7a36dc5e99aace1eca4ec2690c" - integrity sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA== - dependencies: - has "^1.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" - -postcss-normalize-timing-functions@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz#8e009ca2a3949cdaf8ad23e6b6ab99cb5e7d28d9" - integrity sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A== - dependencies: - cssnano-util-get-match "^4.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" - -postcss-normalize-unicode@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz#841bd48fdcf3019ad4baa7493a3d363b52ae1cfb" - integrity sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg== - dependencies: - browserslist "^4.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" - -postcss-normalize-url@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz#10e437f86bc7c7e58f7b9652ed878daaa95faae1" - integrity sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA== - dependencies: - is-absolute-url "^2.0.0" - normalize-url "^3.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" - -postcss-normalize-whitespace@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz#bf1d4070fe4fcea87d1348e825d8cc0c5faa7d82" - integrity sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA== - dependencies: - postcss "^7.0.0" - postcss-value-parser "^3.0.0" - -postcss-ordered-values@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz#0cf75c820ec7d5c4d280189559e0b571ebac0eee" - integrity sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw== - dependencies: - cssnano-util-get-arguments "^4.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" - -postcss-reduce-initial@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz#7fd42ebea5e9c814609639e2c2e84ae270ba48df" - integrity sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA== - dependencies: - browserslist "^4.0.0" - caniuse-api "^3.0.0" - has "^1.0.0" - postcss "^7.0.0" - -postcss-reduce-transforms@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz#17efa405eacc6e07be3414a5ca2d1074681d4e29" - integrity sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg== - dependencies: - cssnano-util-get-match "^4.0.0" - has "^1.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" - -postcss-selector-parser@^3.0.0, postcss-selector-parser@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz#4f875f4afb0c96573d5cf4d74011aee250a7e865" - integrity sha1-T4dfSvsMllc9XPTXQBGu4lCn6GU= - dependencies: - dot-prop "^4.1.1" - indexes-of "^1.0.1" - uniq "^1.0.1" - -postcss-selector-parser@^5.0.0, postcss-selector-parser@^5.0.0-rc.4: - version "5.0.0" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz#249044356697b33b64f1a8f7c80922dddee7195c" - integrity sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ== - dependencies: - cssesc "^2.0.0" - indexes-of "^1.0.1" - uniq "^1.0.1" - -postcss-svgo@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.2.tgz#17b997bc711b333bab143aaed3b8d3d6e3d38258" - integrity sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw== - dependencies: - is-svg "^3.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" - svgo "^1.0.0" - -postcss-unique-selectors@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz#9446911f3289bfd64c6d680f073c03b1f9ee4bac" - integrity sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg== - dependencies: - alphanum-sort "^1.0.0" - postcss "^7.0.0" - uniqs "^2.0.0" - -postcss-value-parser@^3.0.0, postcss-value-parser@^3.3.1: - version "3.3.1" - resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281" - integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ== - -postcss-value-parser@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb" - integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ== - -postcss@6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.1.tgz#000dbd1f8eef217aa368b9a212c5fc40b2a8f3f2" - integrity sha1-AA29H47vIXqjaLmiEsX8QLKo8/I= - dependencies: - chalk "^1.1.3" - source-map "^0.5.6" - supports-color "^3.2.3" - -postcss@^5.2.5: - version "5.2.18" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.18.tgz#badfa1497d46244f6390f58b319830d9107853c5" - integrity sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg== - dependencies: - chalk "^1.1.3" - js-base64 "^2.1.9" - source-map "^0.5.6" - supports-color "^3.2.3" - -postcss@^6.0.1, postcss@^6.0.20, postcss@^6.0.22: - version "6.0.23" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324" - integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag== - dependencies: - chalk "^2.4.1" - source-map "^0.6.1" - supports-color "^5.4.0" - -postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.5: - version "7.0.14" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.14.tgz#4527ed6b1ca0d82c53ce5ec1a2041c2346bbd6e5" - integrity sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg== - dependencies: - chalk "^2.4.2" - source-map "^0.6.1" - supports-color "^6.1.0" - -postcss@^7.0.32: - version "7.0.32" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz#4310d6ee347053da3433db2be492883d62cec59d" - integrity sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw== - dependencies: - chalk "^2.4.2" - source-map "^0.6.1" - supports-color "^6.1.0" - -prepend-http@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" - integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= - -prettier@1.16.3: - version "1.16.3" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.3.tgz#8c62168453badef702f34b45b6ee899574a6a65d" - integrity sha512-kn/GU6SMRYPxUakNXhpP0EedT/KmaPzr0H5lIsDogrykbaxOpOfAFfk5XA7DZrJyMAv1wlMV3CPcZruGXVVUZw== - -prettier@^1.13.0: - version "1.16.4" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.4.tgz#73e37e73e018ad2db9c76742e2647e21790c9717" - integrity sha512-ZzWuos7TI5CKUeQAtFd6Zhm2s6EpAD/ZLApIhsF9pRvRtM1RFo61dM/4MSRUA0SuLugA/zgrZD8m0BaY46Og7g== - -prettysize@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/prettysize/-/prettysize-1.1.0.tgz#c6c52f87161ff172ea435f375f99831dd9a97bb0" - integrity sha512-U5Noa+FYV1dGkICyLJz8IWlDUehPF4Bk9tZRO8YqPhLA9EoiHuFqtnpWY2mvMjHh5eOLo82HipeLn4RIiSsGqQ== - -process-nextick-args@^2.0.0, process-nextick-args@~2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" - integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== - -progress@^1.1.8: - version "1.1.8" - resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be" - integrity sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74= - -progress@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" - integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== - -promise-fs@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/promise-fs/-/promise-fs-2.1.1.tgz#0b725a592c165ff16157d1f13640ba390637e557" - integrity sha512-43p7e4QzAQ3w6eyN0+gbBL7jXiZFWLWYITg9wIObqkBySu/a5K1EDcQ/S6UyB/bmiZWDA4NjTbcopKLTaKcGSw== + "integrity" "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=" + "resolved" "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz" + "version" "3.0.6" + dependencies: + "abbrev" "1" + +"normalize-package-data@^2.3.2", "normalize-package-data@^2.3.4": + "integrity" "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==" + "resolved" "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz" + "version" "2.5.0" + dependencies: + "hosted-git-info" "^2.1.4" + "resolve" "^1.10.0" + "semver" "2 || 3 || 4 || 5" + "validate-npm-package-license" "^3.0.1" + +"normalize-range@^0.1.2": + "integrity" "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=" + "resolved" "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz" + "version" "0.1.2" + +"normalize-url@^3.0.0": + "integrity" "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==" + "resolved" "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz" + "version" "3.3.0" + +"normalize-url@^4.1.0": + "integrity" "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==" + "resolved" "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz" + "version" "4.5.0" + +"npm-run-path@^2.0.0": + "integrity" "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=" + "resolved" "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz" + "version" "2.0.2" + dependencies: + "path-key" "^2.0.0" + +"npmlog@^4.0.0", "npmlog@0 || 1 || 2 || 3 || 4": + "integrity" "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==" + "resolved" "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz" + "version" "4.1.2" + dependencies: + "are-we-there-yet" "~1.1.2" + "console-control-strings" "~1.1.0" + "gauge" "~2.7.3" + "set-blocking" "~2.0.0" + +"nth-check@^1.0.2": + "integrity" "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==" + "resolved" "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz" + "version" "1.0.2" + dependencies: + "boolbase" "~1.0.0" + +"num2fraction@^1.2.2": + "integrity" "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=" + "resolved" "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz" + "version" "1.2.2" + +"number-is-nan@^1.0.0": + "integrity" "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" + "resolved" "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz" + "version" "1.0.1" + +"oauth-sign@~0.9.0": + "integrity" "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==" + "resolved" "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz" + "version" "0.9.0" + +"object-assign@^4.0.1", "object-assign@^4.1.0": + "integrity" "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + "resolved" "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz" + "version" "4.1.1" + +"object-copy@^0.1.0": + "integrity" "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=" + "resolved" "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz" + "version" "0.1.0" + dependencies: + "copy-descriptor" "^0.1.0" + "define-property" "^0.2.5" + "kind-of" "^3.0.3" + +"object-hash@^2.0.3": + "integrity" "sha512-JPKn0GMu+Fa3zt3Bmr66JhokJU5BaNBIh4ZeTlaCBzrBsOeXzwcKKAK1tbLiPKgvwmPXsDvvLHoWh5Bm7ofIYg==" + "resolved" "https://registry.npmjs.org/object-hash/-/object-hash-2.0.3.tgz" + "version" "2.0.3" + +"object-inspect@^1.7.0": + "integrity" "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==" + "resolved" "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz" + "version" "1.7.0" + +"object-is@^1.1.2": + "integrity" "sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ==" + "resolved" "https://registry.npmjs.org/object-is/-/object-is-1.1.2.tgz" + "version" "1.1.2" + dependencies: + "define-properties" "^1.1.3" + "es-abstract" "^1.17.5" + +"object-keys@^1.0.11", "object-keys@^1.1.1": + "integrity" "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" + "resolved" "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz" + "version" "1.1.1" + +"object-keys@^1.0.12": + "integrity" "sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg==" + "resolved" "https://registry.npmjs.org/object-keys/-/object-keys-1.1.0.tgz" + "version" "1.1.0" + +"object-visit@^1.0.0": + "integrity" "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=" + "resolved" "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz" + "version" "1.0.1" + dependencies: + "isobject" "^3.0.0" + +"object.assign@^4.1.0": + "integrity" "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==" + "resolved" "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz" + "version" "4.1.0" + dependencies: + "define-properties" "^1.1.2" + "function-bind" "^1.1.1" + "has-symbols" "^1.0.0" + "object-keys" "^1.0.11" + +"object.getownpropertydescriptors@^2.0.3": + "integrity" "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=" + "resolved" "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz" + "version" "2.0.3" + dependencies: + "define-properties" "^1.1.2" + "es-abstract" "^1.5.1" + +"object.pick@^1.3.0": + "integrity" "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=" + "resolved" "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz" + "version" "1.3.0" + dependencies: + "isobject" "^3.0.1" + +"object.values@^1.1.0": + "integrity" "sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==" + "resolved" "https://registry.npmjs.org/object.values/-/object.values-1.1.0.tgz" + "version" "1.1.0" + dependencies: + "define-properties" "^1.1.3" + "es-abstract" "^1.12.0" + "function-bind" "^1.1.1" + "has" "^1.0.3" + +"omggif@^1.0.5": + "integrity" "sha512-LMJTtvgc/nugXj0Vcrrs68Mn2D1r0zf630VNtqtpI1FEO7e+O9FP4gqs9AcnBaSEeoHIPm28u6qgPR0oyEpGSw==" + "resolved" "https://registry.npmjs.org/omggif/-/omggif-1.0.10.tgz" + "version" "1.0.10" + +"on-finished@~2.3.0": + "integrity" "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=" + "resolved" "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz" + "version" "2.3.0" + dependencies: + "ee-first" "1.1.1" + +"once@^1.3.0", "once@^1.3.1", "once@^1.4.0": + "integrity" "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=" + "resolved" "https://registry.npmjs.org/once/-/once-1.4.0.tgz" + "version" "1.4.0" + dependencies: + "wrappy" "1" + +"one-time@^1.0.0": + "integrity" "sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==" + "resolved" "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz" + "version" "1.0.0" + dependencies: + "fn.name" "1.x.x" + +"onetime@^5.1.0": + "integrity" "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==" + "resolved" "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz" + "version" "5.1.2" + dependencies: + "mimic-fn" "^2.1.0" + +"open@^7.0.3": + "integrity" "sha512-sP2ru2v0P290WFfv49Ap8MF6PkzGNnGlAwHweB4WR4mr5d2d0woiCluUeJ218w7/+PmoBy9JmYgD5A4mLcWOFA==" + "resolved" "https://registry.npmjs.org/open/-/open-7.0.3.tgz" + "version" "7.0.3" + dependencies: + "is-docker" "^2.0.0" + "is-wsl" "^2.1.1" + +"ora@5.3.0": + "integrity" "sha512-zAKMgGXUim0Jyd6CXK9lraBnD3H5yPGBPPOkC23a2BG6hsm4Zu6OQSjQuEtV0BHDf4aKHcUFvJiGRrFuW3MG8g==" + "resolved" "https://registry.npmjs.org/ora/-/ora-5.3.0.tgz" + "version" "5.3.0" + dependencies: + "bl" "^4.0.3" + "chalk" "^4.1.0" + "cli-cursor" "^3.1.0" + "cli-spinners" "^2.5.0" + "is-interactive" "^1.0.0" + "log-symbols" "^4.0.0" + "strip-ansi" "^6.0.0" + "wcwidth" "^1.0.1" + +"os-homedir@^1.0.0", "os-homedir@^1.0.1": + "integrity" "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" + "resolved" "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz" + "version" "1.0.2" + +"os-locale@^3.0.0": + "integrity" "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==" + "resolved" "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz" + "version" "3.1.0" + dependencies: + "execa" "^1.0.0" + "lcid" "^2.0.0" + "mem" "^4.0.0" + +"os-name@^3.0.0": + "integrity" "sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==" + "resolved" "https://registry.npmjs.org/os-name/-/os-name-3.1.0.tgz" + "version" "3.1.0" + dependencies: + "macos-release" "^2.2.0" + "windows-release" "^3.1.0" + +"os-tmpdir@^1.0.0", "os-tmpdir@~1.0.2": + "integrity" "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" + "resolved" "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz" + "version" "1.0.2" + +"osenv@0": + "integrity" "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==" + "resolved" "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz" + "version" "0.1.5" + dependencies: + "os-homedir" "^1.0.0" + "os-tmpdir" "^1.0.0" + +"p-cancelable@^1.0.0": + "integrity" "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==" + "resolved" "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz" + "version" "1.1.0" + +"p-cancelable@^2.0.0": + "integrity" "sha512-wvPXDmbMmu2ksjkB4Z3nZWTSkJEb9lqVdMaCKpZUGJG9TMiNp9XcbG3fn9fPKjem04fJMJnXoyFPk2FmgiaiNg==" + "resolved" "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.0.0.tgz" + "version" "2.0.0" + +"p-defer@^1.0.0": + "integrity" "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=" + "resolved" "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz" + "version" "1.0.0" + +"p-finally@^1.0.0": + "integrity" "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=" + "resolved" "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz" + "version" "1.0.0" + +"p-is-promise@^2.0.0": + "integrity" "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==" + "resolved" "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz" + "version" "2.1.0" + +"p-limit@^2.0.0": + "integrity" "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==" + "resolved" "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz" + "version" "2.3.0" + dependencies: + "p-try" "^2.0.0" + +"p-locate@^3.0.0": + "integrity" "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==" + "resolved" "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz" + "version" "3.0.0" + dependencies: + "p-limit" "^2.0.0" + +"p-map@^4.0.0": + "integrity" "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==" + "resolved" "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz" + "version" "4.0.0" + dependencies: + "aggregate-error" "^3.0.0" + +"p-map@2.1.0": + "integrity" "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==" + "resolved" "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz" + "version" "2.1.0" + +"p-queue@^2.4.2": + "integrity" "sha512-n8/y+yDJwBjoLQe1GSJbbaYQLTI7QHNZI2+rpmCDbe++WLf9HC3gf6iqj5yfPAV71W4UF3ql5W1+UBPXoXTxng==" + "resolved" "https://registry.npmjs.org/p-queue/-/p-queue-2.4.2.tgz" + "version" "2.4.2" + +"p-try@^2.0.0": + "integrity" "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" + "resolved" "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz" + "version" "2.2.0" + +"package-json@^6.3.0": + "integrity" "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==" + "resolved" "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz" + "version" "6.5.0" + dependencies: + "got" "^9.6.0" + "registry-auth-token" "^4.0.0" + "registry-url" "^5.0.0" + "semver" "^6.2.0" + +"pako@~0.2.0": + "integrity" "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=" + "resolved" "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz" + "version" "0.2.9" + +"pako@~1.0.2": + "integrity" "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==" + "resolved" "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz" + "version" "1.0.11" + +"parchment@^1.1.4": + "integrity" "sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg==" + "resolved" "https://registry.npmjs.org/parchment/-/parchment-1.1.4.tgz" + "version" "1.1.4" + +"parchment@2.0.0-dev.2": + "integrity" "sha512-4fgRny4pPISoML08Zp7poi52Dff3E2G1ORTi2D/acJ/RiROdDAMDB6VcQNfBcmehrX5Wixp6dxh6JjLyE5yUNQ==" + "resolved" "https://registry.npmjs.org/parchment/-/parchment-2.0.0-dev.2.tgz" + "version" "2.0.0-dev.2" + +"parse-data-uri@^0.2.0": + "integrity" "sha1-vwTYUd1ch7CrI45dAazklLYEtMk=" + "resolved" "https://registry.npmjs.org/parse-data-uri/-/parse-data-uri-0.2.0.tgz" + "version" "0.2.0" + dependencies: + "data-uri-to-buffer" "0.0.3" + +"parse-json@^2.2.0": + "integrity" "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=" + "resolved" "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz" + "version" "2.2.0" + dependencies: + "error-ex" "^1.2.0" + +"parse-json@^4.0.0": + "integrity" "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=" + "resolved" "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz" + "version" "4.0.0" + dependencies: + "error-ex" "^1.3.1" + "json-parse-better-errors" "^1.0.1" + +"parse-link-header@^1.0.1": + "integrity" "sha1-vt/g0hGK64S+deewJUGeyKYRQKc=" + "resolved" "https://registry.npmjs.org/parse-link-header/-/parse-link-header-1.0.1.tgz" + "version" "1.0.1" + dependencies: + "xtend" "~4.0.1" + +"parse-passwd@^1.0.0": + "integrity" "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=" + "resolved" "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz" + "version" "1.0.0" + +"parseqs@0.0.6": + "integrity" "sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w==" + "resolved" "https://registry.npmjs.org/parseqs/-/parseqs-0.0.6.tgz" + "version" "0.0.6" + +"parseuri@0.0.6": + "integrity" "sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow==" + "resolved" "https://registry.npmjs.org/parseuri/-/parseuri-0.0.6.tgz" + "version" "0.0.6" + +"parseurl@~1.3.3": + "integrity" "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==" + "resolved" "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz" + "version" "1.3.3" + +"pascalcase@^0.1.1": + "integrity" "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=" + "resolved" "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz" + "version" "0.1.1" + +"path-exists@^2.0.0": + "integrity" "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=" + "resolved" "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz" + "version" "2.1.0" + dependencies: + "pinkie-promise" "^2.0.0" + +"path-exists@^3.0.0": + "integrity" "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=" + "resolved" "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz" + "version" "3.0.0" + +"path-is-absolute@^1.0.0": + "integrity" "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" + "resolved" "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz" + "version" "1.0.1" + +"path-key@^2.0.0", "path-key@^2.0.1": + "integrity" "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=" + "resolved" "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz" + "version" "2.0.1" + +"path-parse@^1.0.6": + "integrity" "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" + "resolved" "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz" + "version" "1.0.6" + +"path-to-regexp@0.1.7": + "integrity" "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" + "resolved" "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz" + "version" "0.1.7" + +"path-type@^1.0.0": + "integrity" "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=" + "resolved" "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz" + "version" "1.1.0" + dependencies: + "graceful-fs" "^4.1.2" + "pify" "^2.0.0" + "pinkie-promise" "^2.0.0" + +"peek-stream@^1.1.0": + "integrity" "sha512-FhJ+YbOSBb9/rIl2ZeE/QHEsWn7PqNYt8ARAY3kIgNGOk13g9FGyIY6JIl/xB/3TFRVoTv5as0l11weORrTekA==" + "resolved" "https://registry.npmjs.org/peek-stream/-/peek-stream-1.1.3.tgz" + "version" "1.1.3" + dependencies: + "buffer-from" "^1.0.0" + "duplexify" "^3.5.0" + "through2" "^2.0.3" + +"pend@~1.2.0": + "integrity" "sha1-elfrVQpng/kRUzH89GY9XI4AelA=" + "resolved" "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz" + "version" "1.2.0" + +"performance-now@^2.1.0": + "integrity" "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" + "resolved" "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz" + "version" "2.1.0" + +"phantomjs-prebuilt@^2.1.16": + "integrity" "sha1-79ISpKOWbTZHaE6ouniFSb4q7+8=" + "resolved" "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.16.tgz" + "version" "2.1.16" + dependencies: + "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" + +"picomatch@^2.0.5", "picomatch@^2.2.1": + "integrity" "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==" + "resolved" "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz" + "version" "2.2.2" + +"pify@^2.0.0": + "integrity" "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" + "resolved" "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz" + "version" "2.3.0" + +"pify@^3.0.0": + "integrity" "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" + "resolved" "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz" + "version" "3.0.0" + +"pinkie-promise@^2.0.0": + "integrity" "sha1-ITXW36ejWMBprJsXh3YogihFD/o=" + "resolved" "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz" + "version" "2.0.1" + dependencies: + "pinkie" "^2.0.0" + +"pinkie@^2.0.0": + "integrity" "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=" + "resolved" "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz" + "version" "2.0.4" + +"plyr@^3.6.2": + "integrity" "sha512-CjAhRDtzyGqMRte9Phj4FsZFegS9VxW60boOhQsAnZHuiFG3yVBRcodWsGZ79GuXHHelc4DxMHO+z0QggY+9qQ==" + "resolved" "https://registry.npmjs.org/plyr/-/plyr-3.6.2.tgz" + "version" "3.6.2" + dependencies: + "core-js" "^3.6.5" + "custom-event-polyfill" "^1.0.7" + "loadjs" "^4.2.0" + "rangetouch" "^2.0.1" + "url-polyfill" "^1.1.8" + +"pngjs@^3.3.3": + "integrity" "sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==" + "resolved" "https://registry.npmjs.org/pngjs/-/pngjs-3.4.0.tgz" + "version" "3.4.0" + +"popper.js@^1.16.0": + "integrity" "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==" + "resolved" "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz" + "version" "1.16.1" + +"posix-character-classes@^0.1.0": + "integrity" "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" + "resolved" "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz" + "version" "0.1.1" + +"postcss-calc@^7.0.1": + "integrity" "sha512-oXqx0m6tb4N3JGdmeMSc/i91KppbYsFZKdH0xMOqK8V1rJlzrKlTdokz8ozUXLVejydRN6u2IddxpcijRj2FqQ==" + "resolved" "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.1.tgz" + "version" "7.0.1" + dependencies: + "css-unit-converter" "^1.1.1" + "postcss" "^7.0.5" + "postcss-selector-parser" "^5.0.0-rc.4" + "postcss-value-parser" "^3.3.1" + +"postcss-colormin@^4.0.3": + "integrity" "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==" + "resolved" "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz" + "version" "4.0.3" + dependencies: + "browserslist" "^4.0.0" + "color" "^3.0.0" + "has" "^1.0.0" + "postcss" "^7.0.0" + "postcss-value-parser" "^3.0.0" + +"postcss-convert-values@^4.0.1": + "integrity" "sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==" + "resolved" "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz" + "version" "4.0.1" + dependencies: + "postcss" "^7.0.0" + "postcss-value-parser" "^3.0.0" + +"postcss-discard-comments@^4.0.2": + "integrity" "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==" + "resolved" "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz" + "version" "4.0.2" + dependencies: + "postcss" "^7.0.0" + +"postcss-discard-duplicates@^4.0.2": + "integrity" "sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==" + "resolved" "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz" + "version" "4.0.2" + dependencies: + "postcss" "^7.0.0" + +"postcss-discard-empty@^4.0.1": + "integrity" "sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==" + "resolved" "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz" + "version" "4.0.1" + dependencies: + "postcss" "^7.0.0" + +"postcss-discard-overridden@^4.0.1": + "integrity" "sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==" + "resolved" "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz" + "version" "4.0.1" + dependencies: + "postcss" "^7.0.0" + +"postcss-load-config@^2.0.0": + "integrity" "sha512-V5JBLzw406BB8UIfsAWSK2KSwIJ5yoEIVFb4gVkXci0QdKgA24jLmHZ/ghe/GgX0lJ0/D1uUK1ejhzEY94MChQ==" + "resolved" "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.0.0.tgz" + "version" "2.0.0" + dependencies: + "cosmiconfig" "^4.0.0" + "import-cwd" "^2.0.0" + +"postcss-merge-longhand@^4.0.11": + "integrity" "sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==" + "resolved" "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz" + "version" "4.0.11" + dependencies: + "css-color-names" "0.0.4" + "postcss" "^7.0.0" + "postcss-value-parser" "^3.0.0" + "stylehacks" "^4.0.0" + +"postcss-merge-rules@^4.0.3": + "integrity" "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==" + "resolved" "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz" + "version" "4.0.3" + dependencies: + "browserslist" "^4.0.0" + "caniuse-api" "^3.0.0" + "cssnano-util-same-parent" "^4.0.0" + "postcss" "^7.0.0" + "postcss-selector-parser" "^3.0.0" + "vendors" "^1.0.0" + +"postcss-minify-font-values@^4.0.2": + "integrity" "sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==" + "resolved" "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz" + "version" "4.0.2" + dependencies: + "postcss" "^7.0.0" + "postcss-value-parser" "^3.0.0" + +"postcss-minify-gradients@^4.0.2": + "integrity" "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==" + "resolved" "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz" + "version" "4.0.2" + dependencies: + "cssnano-util-get-arguments" "^4.0.0" + "is-color-stop" "^1.0.0" + "postcss" "^7.0.0" + "postcss-value-parser" "^3.0.0" + +"postcss-minify-params@^4.0.2": + "integrity" "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==" + "resolved" "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz" + "version" "4.0.2" + dependencies: + "alphanum-sort" "^1.0.0" + "browserslist" "^4.0.0" + "cssnano-util-get-arguments" "^4.0.0" + "postcss" "^7.0.0" + "postcss-value-parser" "^3.0.0" + "uniqs" "^2.0.0" + +"postcss-minify-selectors@^4.0.2": + "integrity" "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==" + "resolved" "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz" + "version" "4.0.2" + dependencies: + "alphanum-sort" "^1.0.0" + "has" "^1.0.0" + "postcss" "^7.0.0" + "postcss-selector-parser" "^3.0.0" + +"postcss-modules-extract-imports@1.1.0": + "integrity" "sha1-thTJcgvmgW6u41+zpfqh26agXds=" + "resolved" "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz" + "version" "1.1.0" + dependencies: + "postcss" "^6.0.1" + +"postcss-modules-local-by-default@^1.1.1", "postcss-modules-local-by-default@1.2.0": + "integrity" "sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=" + "resolved" "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz" + "version" "1.2.0" + dependencies: + "css-selector-tokenizer" "^0.7.0" + "postcss" "^6.0.1" + +"postcss-modules-scope@^1.0.2", "postcss-modules-scope@1.1.0": + "integrity" "sha1-1upkmUx5+XtipytCb75gVqGUu5A=" + "resolved" "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz" + "version" "1.1.0" + dependencies: + "css-selector-tokenizer" "^0.7.0" + "postcss" "^6.0.1" + +"postcss-modules-sync@^1.0.0": + "integrity" "sha1-YZpxnPeN0WpINBNRQLMkz3czS+E=" + "resolved" "https://registry.npmjs.org/postcss-modules-sync/-/postcss-modules-sync-1.0.0.tgz" + "version" "1.0.0" + dependencies: + "generic-names" "^1.0.2" + "icss-replace-symbols" "^1.0.2" + "postcss" "^5.2.5" + "postcss-modules-local-by-default" "^1.1.1" + "postcss-modules-scope" "^1.0.2" + "string-hash" "^1.1.0" + +"postcss-modules-values@1.3.0": + "integrity" "sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=" + "resolved" "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz" + "version" "1.3.0" + dependencies: + "icss-replace-symbols" "^1.1.0" + "postcss" "^6.0.1" + +"postcss-modules@^1.4.1": + "integrity" "sha512-btTrbK+Xc3NBuYF8TPBjCMRSp5h6NoQ1iVZ6WiDQENIze6KIYCSf0+UFQuV3yJ7gRHA+4AAtF8i2jRvUpbBMMg==" + "resolved" "https://registry.npmjs.org/postcss-modules/-/postcss-modules-1.4.1.tgz" + "version" "1.4.1" + dependencies: + "css-modules-loader-core" "^1.1.0" + "generic-names" "^1.0.3" + "lodash.camelcase" "^4.3.0" + "postcss" "^7.0.1" + "string-hash" "^1.1.1" + +"postcss-normalize-charset@^4.0.1": + "integrity" "sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==" + "resolved" "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz" + "version" "4.0.1" + dependencies: + "postcss" "^7.0.0" + +"postcss-normalize-display-values@^4.0.2": + "integrity" "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==" + "resolved" "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz" + "version" "4.0.2" + dependencies: + "cssnano-util-get-match" "^4.0.0" + "postcss" "^7.0.0" + "postcss-value-parser" "^3.0.0" + +"postcss-normalize-positions@^4.0.2": + "integrity" "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==" + "resolved" "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz" + "version" "4.0.2" + dependencies: + "cssnano-util-get-arguments" "^4.0.0" + "has" "^1.0.0" + "postcss" "^7.0.0" + "postcss-value-parser" "^3.0.0" + +"postcss-normalize-repeat-style@^4.0.2": + "integrity" "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==" + "resolved" "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz" + "version" "4.0.2" + dependencies: + "cssnano-util-get-arguments" "^4.0.0" + "cssnano-util-get-match" "^4.0.0" + "postcss" "^7.0.0" + "postcss-value-parser" "^3.0.0" + +"postcss-normalize-string@^4.0.2": + "integrity" "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==" + "resolved" "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz" + "version" "4.0.2" + dependencies: + "has" "^1.0.0" + "postcss" "^7.0.0" + "postcss-value-parser" "^3.0.0" + +"postcss-normalize-timing-functions@^4.0.2": + "integrity" "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==" + "resolved" "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz" + "version" "4.0.2" + dependencies: + "cssnano-util-get-match" "^4.0.0" + "postcss" "^7.0.0" + "postcss-value-parser" "^3.0.0" + +"postcss-normalize-unicode@^4.0.1": + "integrity" "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==" + "resolved" "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz" + "version" "4.0.1" + dependencies: + "browserslist" "^4.0.0" + "postcss" "^7.0.0" + "postcss-value-parser" "^3.0.0" + +"postcss-normalize-url@^4.0.1": + "integrity" "sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==" + "resolved" "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz" + "version" "4.0.1" + dependencies: + "is-absolute-url" "^2.0.0" + "normalize-url" "^3.0.0" + "postcss" "^7.0.0" + "postcss-value-parser" "^3.0.0" + +"postcss-normalize-whitespace@^4.0.2": + "integrity" "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==" + "resolved" "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz" + "version" "4.0.2" + dependencies: + "postcss" "^7.0.0" + "postcss-value-parser" "^3.0.0" + +"postcss-ordered-values@^4.1.2": + "integrity" "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==" + "resolved" "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz" + "version" "4.1.2" + dependencies: + "cssnano-util-get-arguments" "^4.0.0" + "postcss" "^7.0.0" + "postcss-value-parser" "^3.0.0" + +"postcss-reduce-initial@^4.0.3": + "integrity" "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==" + "resolved" "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz" + "version" "4.0.3" + dependencies: + "browserslist" "^4.0.0" + "caniuse-api" "^3.0.0" + "has" "^1.0.0" + "postcss" "^7.0.0" + +"postcss-reduce-transforms@^4.0.2": + "integrity" "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==" + "resolved" "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz" + "version" "4.0.2" + dependencies: + "cssnano-util-get-match" "^4.0.0" + "has" "^1.0.0" + "postcss" "^7.0.0" + "postcss-value-parser" "^3.0.0" + +"postcss-selector-parser@^3.0.0", "postcss-selector-parser@^3.1.1": + "integrity" "sha1-T4dfSvsMllc9XPTXQBGu4lCn6GU=" + "resolved" "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz" + "version" "3.1.1" + dependencies: + "dot-prop" "^4.1.1" + "indexes-of" "^1.0.1" + "uniq" "^1.0.1" + +"postcss-selector-parser@^5.0.0-rc.4": + "integrity" "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==" + "resolved" "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz" + "version" "5.0.0" + dependencies: + "cssesc" "^2.0.0" + "indexes-of" "^1.0.1" + "uniq" "^1.0.1" + +"postcss-selector-parser@^5.0.0": + "integrity" "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==" + "resolved" "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz" + "version" "5.0.0" + dependencies: + "cssesc" "^2.0.0" + "indexes-of" "^1.0.1" + "uniq" "^1.0.1" + +"postcss-svgo@^4.0.2": + "integrity" "sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw==" + "resolved" "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.2.tgz" + "version" "4.0.2" + dependencies: + "is-svg" "^3.0.0" + "postcss" "^7.0.0" + "postcss-value-parser" "^3.0.0" + "svgo" "^1.0.0" + +"postcss-unique-selectors@^4.0.1": + "integrity" "sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==" + "resolved" "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz" + "version" "4.0.1" + dependencies: + "alphanum-sort" "^1.0.0" + "postcss" "^7.0.0" + "uniqs" "^2.0.0" + +"postcss-value-parser@^3.0.0", "postcss-value-parser@^3.3.1": + "integrity" "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" + "resolved" "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz" + "version" "3.3.1" + +"postcss-value-parser@^4.1.0": + "integrity" "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==" + "resolved" "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz" + "version" "4.1.0" + +"postcss@^5.2.5": + "integrity" "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==" + "resolved" "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz" + "version" "5.2.18" + dependencies: + "chalk" "^1.1.3" + "js-base64" "^2.1.9" + "source-map" "^0.5.6" + "supports-color" "^3.2.3" + +"postcss@^6.0.1": + "integrity" "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==" + "resolved" "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz" + "version" "6.0.23" + dependencies: + "chalk" "^2.4.1" + "source-map" "^0.6.1" + "supports-color" "^5.4.0" + +"postcss@^6.0.20": + "integrity" "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==" + "resolved" "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz" + "version" "6.0.23" + dependencies: + "chalk" "^2.4.1" + "source-map" "^0.6.1" + "supports-color" "^5.4.0" + +"postcss@^6.0.22", "postcss@>=6.0": + "integrity" "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==" + "resolved" "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz" + "version" "6.0.23" + dependencies: + "chalk" "^2.4.1" + "source-map" "^0.6.1" + "supports-color" "^5.4.0" + +"postcss@^7.0.0", "postcss@^7.0.1", "postcss@^7.0.14", "postcss@^7.0.5": + "integrity" "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==" + "resolved" "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz" + "version" "7.0.14" + dependencies: + "chalk" "^2.4.2" + "source-map" "^0.6.1" + "supports-color" "^6.1.0" + +"postcss@^7.0.32": + "integrity" "sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==" + "resolved" "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz" + "version" "7.0.32" + dependencies: + "chalk" "^2.4.2" + "source-map" "^0.6.1" + "supports-color" "^6.1.0" + +"postcss@6.0.1": + "integrity" "sha1-AA29H47vIXqjaLmiEsX8QLKo8/I=" + "resolved" "https://registry.npmjs.org/postcss/-/postcss-6.0.1.tgz" + "version" "6.0.1" + dependencies: + "chalk" "^1.1.3" + "source-map" "^0.5.6" + "supports-color" "^3.2.3" + +"prepend-http@^2.0.0": + "integrity" "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=" + "resolved" "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz" + "version" "2.0.0" + +"prettier@^1.13.0": + "integrity" "sha512-ZzWuos7TI5CKUeQAtFd6Zhm2s6EpAD/ZLApIhsF9pRvRtM1RFo61dM/4MSRUA0SuLugA/zgrZD8m0BaY46Og7g==" + "resolved" "https://registry.npmjs.org/prettier/-/prettier-1.16.4.tgz" + "version" "1.16.4" + +"prettier@1.16.3": + "integrity" "sha512-kn/GU6SMRYPxUakNXhpP0EedT/KmaPzr0H5lIsDogrykbaxOpOfAFfk5XA7DZrJyMAv1wlMV3CPcZruGXVVUZw==" + "resolved" "https://registry.npmjs.org/prettier/-/prettier-1.16.3.tgz" + "version" "1.16.3" + +"prettysize@^1.1.0": + "integrity" "sha512-U5Noa+FYV1dGkICyLJz8IWlDUehPF4Bk9tZRO8YqPhLA9EoiHuFqtnpWY2mvMjHh5eOLo82HipeLn4RIiSsGqQ==" + "resolved" "https://registry.npmjs.org/prettysize/-/prettysize-1.1.0.tgz" + "version" "1.1.0" + +"process-nextick-args@^2.0.0", "process-nextick-args@~2.0.0": + "integrity" "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" + "resolved" "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz" + "version" "2.0.1" + +"progress@^1.1.8": + "integrity" "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=" + "resolved" "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz" + "version" "1.1.8" + +"progress@^2.0.3": + "integrity" "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==" + "resolved" "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz" + "version" "2.0.3" + +"promise-fs@^2.1.1": + "integrity" "sha512-43p7e4QzAQ3w6eyN0+gbBL7jXiZFWLWYITg9wIObqkBySu/a5K1EDcQ/S6UyB/bmiZWDA4NjTbcopKLTaKcGSw==" + "resolved" "https://registry.npmjs.org/promise-fs/-/promise-fs-2.1.1.tgz" + "version" "2.1.1" dependencies: "@octetstream/promisify" "2.0.2" -promise-queue@^2.2.5: - version "2.2.5" - resolved "https://registry.yarnpkg.com/promise-queue/-/promise-queue-2.2.5.tgz#2f6f5f7c0f6d08109e967659c79b88a9ed5e93b4" - integrity sha1-L29ffA9tCBCelnZZx5uIqe1ek7Q= - -promise.series@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/promise.series/-/promise.series-0.2.0.tgz#2cc7ebe959fc3a6619c04ab4dbdc9e452d864bbd" - integrity sha1-LMfr6Vn8OmYZwEq029yeRS2GS70= - -"promise@>=3.2 <8", promise@^7.1.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf" - integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg== - dependencies: - asap "~2.0.3" - -proxy-addr@~2.0.5: - version "2.0.6" - resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf" - integrity sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw== - dependencies: - forwarded "~0.1.2" - ipaddr.js "1.9.1" - -proxy-from-env@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee" - integrity sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4= - -prr@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" - integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY= - -pseudomap@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" - integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM= - -psl@^1.1.24, psl@^1.1.28: - version "1.8.0" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" - integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== - -pump@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909" - integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA== - dependencies: - end-of-stream "^1.1.0" - once "^1.3.1" - -pump@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" - integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== - dependencies: - end-of-stream "^1.1.0" - once "^1.3.1" - -pumpify@^1.3.3: - version "1.5.1" - resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce" - integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ== - dependencies: - duplexify "^3.6.0" - inherits "^2.0.3" - pump "^2.0.0" - -punycode@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" - integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= - -punycode@^2.1.0, punycode@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" - integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== - -pupa@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.0.1.tgz#dbdc9ff48ffbea4a26a069b6f9f7abb051008726" - integrity sha512-hEJH0s8PXLY/cdXh66tNEQGndDrIKNqNC5xmrysZy3i5C3oEoLna7YAOad+7u125+zH1HNXUmGEkrhb3c2VriA== - dependencies: - escape-goat "^2.0.0" - -q@^1.1.2: - version "1.5.1" - resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" - integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc= - -qs@6.7.0, qs@^6.5.1: - version "6.7.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" - integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== - -qs@~6.5.2: - version "6.5.2" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" - integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== - -quagga@^0.12.1: - version "0.12.1" - resolved "https://registry.yarnpkg.com/quagga/-/quagga-0.12.1.tgz#6f48c56ed992dc5fdeb90dbee7069c2e1cdde8b7" - integrity sha1-b0jFbtmS3F/euQ2+5wacLhzd6Lc= - dependencies: - get-pixels "^3.2.3" - gl-mat2 "^1.0.0" - gl-vec2 "^1.0.0" - gl-vec3 "^1.0.3" - lodash "^4.17.4" - ndarray "^1.0.18" - ndarray-linear-interpolate "^1.0.0" - -querystring@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" - integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= - -queue-microtask@^1.2.2: - version "1.2.3" - resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" - integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== - -queue@^6.0.1: - version "6.0.2" - resolved "https://registry.yarnpkg.com/queue/-/queue-6.0.2.tgz#b91525283e2315c7553d2efa18d83e76432fed65" - integrity sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA== - dependencies: - inherits "~2.0.3" - -quick-lru@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" - integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA== - -quill-delta@4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/quill-delta/-/quill-delta-4.2.1.tgz#ad4f191cdf3be5079c5dc3991b9603a5cc0db69a" - integrity sha512-Y2nksOj6Q+4hizre8n0dml76vLNGK4/y86EoI1d7rv6EL1bx7DPDYRmqQMPu1UqFQO/uQuVHQ3fOmm4ZSzWrfA== - dependencies: - deep-equal "^1.0.1" - extend "^3.0.2" - fast-diff "1.2.0" - -quill-delta@^3.6.2: - version "3.6.3" - resolved "https://registry.yarnpkg.com/quill-delta/-/quill-delta-3.6.3.tgz#b19fd2b89412301c60e1ff213d8d860eac0f1032" - integrity sha512-wdIGBlcX13tCHOXGMVnnTVFtGRLoP0imqxM696fIPwIf5ODIYUHIvHbZcyvGlZFiFhK5XzDC2lpjbxRhnM05Tg== - dependencies: - deep-equal "^1.0.1" - extend "^3.0.2" - fast-diff "1.1.2" - -quill-image-resize@^3.0.9: - version "3.0.9" - resolved "https://registry.yarnpkg.com/quill-image-resize/-/quill-image-resize-3.0.9.tgz#5677fb6257560bff951153ddbdb836758e49f804" - integrity sha512-5Dk0nixhbFsCwSWtPU9qqqtfM2gURfaP+pbBhQvAoMJoF4p99xbAibfAI3gsZJkbWUodoK2iAPf1V5oTSpv9ww== - dependencies: - lodash "^4.17.4" - quill "^1.2.2" - raw-loader "^0.5.1" - -quill@2.0.0-dev.4: - version "2.0.0-dev.4" - resolved "https://registry.yarnpkg.com/quill/-/quill-2.0.0-dev.4.tgz#130e38efe7a16b3766d767d750c8aacc038945e7" - integrity sha512-9WmMVCEIhf3lDdhzl+i+GBDeDl0BFi65waC4Im8Y4HudEJ9kEEb1lciAz9A8pcDmLMjiMbvz84lNt/U5OBS8Vg== - dependencies: - clone "^2.1.2" - deep-equal "^2.0.2" - eventemitter3 "^4.0.0" - extend "^3.0.2" - parchment "2.0.0-dev.2" - quill-delta "4.2.1" - -quill@^1.2.2: - version "1.3.7" - resolved "https://registry.yarnpkg.com/quill/-/quill-1.3.7.tgz#da5b2f3a2c470e932340cdbf3668c9f21f9286e8" - integrity sha512-hG/DVzh/TiknWtE6QmWAF/pxoZKYxfe3J/d/+ShUWkDvvkZQVTPeVmUJVu1uE6DDooC4fWTiCLh84ul89oNz5g== - dependencies: - clone "^2.1.1" - deep-equal "^1.0.1" - eventemitter3 "^2.0.3" - extend "^3.0.2" - parchment "^1.1.4" - quill-delta "^3.6.2" - -qz-tray@^2.0.8: - version "2.0.8" - resolved "https://registry.yarnpkg.com/qz-tray/-/qz-tray-2.0.8.tgz#5e15d102cf3a11a31ddb332891c7f8a6af8f6ad5" - integrity sha512-lncGYzz7/sTORZuC1S3ukNlMPCMOmsHWNvJF4FjMCZ2+0UV3txi6kgPd754B7kDFKm0J587sIODgxIlFY7qU4w== - -range-parser@~1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" - integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== - -rangetouch@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/rangetouch/-/rangetouch-2.0.1.tgz#c01105110fd3afca2adcb1a580692837d883cb70" - integrity sha512-sln+pNSc8NGaHoLzwNBssFSf/rSYkqeBXzX1AtJlkJiUaVSJSbRAWJk+4omsXkN+EJalzkZhWQ3th1m0FpR5xA== - -raw-body@2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332" - integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q== - dependencies: - bytes "3.1.0" - http-errors "1.7.2" - iconv-lite "0.4.24" - unpipe "1.0.0" - -raw-loader@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa" - integrity sha1-DD0L6u2KAclm2Xh793goElKpeao= - -rc@^1.2.8: - version "1.2.8" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" - integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== - dependencies: - deep-extend "^0.6.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" - -read-pkg-up@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02" - integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI= - dependencies: - find-up "^1.0.0" - read-pkg "^1.0.0" - -read-pkg@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28" - integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg= - dependencies: - load-json-file "^1.0.0" - normalize-package-data "^2.3.2" - path-type "^1.0.0" - -readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.3.5, readable-stream@^2.3.7, readable-stream@~2.3.6: - version "2.3.7" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" - integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== - dependencies: - 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" - -readable-stream@^3.0.1, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.5.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" - integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== - dependencies: - inherits "^2.0.3" - string_decoder "^1.1.1" - util-deprecate "^1.0.1" - -redent@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde" - integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94= - dependencies: - indent-string "^2.1.0" - strip-indent "^1.0.1" - -redis-commands@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.7.0.tgz#15a6fea2d58281e27b1cd1acfb4b293e278c3a89" - integrity sha512-nJWqw3bTFy21hX/CPKHth6sfhZbdiHP6bTawSgQBlKOVRG7EZkfHbbHwQJnrE4vsQf0CMNE+3gJ4Fmm16vdVlQ== - -redis-errors@^1.0.0, redis-errors@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/redis-errors/-/redis-errors-1.2.0.tgz#eb62d2adb15e4eaf4610c04afe1529384250abad" - integrity sha1-62LSrbFeTq9GEMBK/hUpOEJQq60= - -redis-parser@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/redis-parser/-/redis-parser-3.0.0.tgz#b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4" - integrity sha1-tm2CjNyv5rS4pCin3vTGvKwxyLQ= - dependencies: - redis-errors "^1.0.0" - -redis@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/redis/-/redis-3.1.1.tgz#a44bee7c072dcf685e139048d6a1a4d3b00f5d01" - integrity sha512-QhkKhOuzhogR1NDJfBD34TQJz2ZJwDhhIC6ZmvpftlmfYShHHQXjjNspAJ+Z2HH5NwSBVYBVganbiZ8bgFMHjg== - dependencies: - denque "^1.5.0" - redis-commands "^1.7.0" - redis-errors "^1.2.0" - redis-parser "^3.0.0" - -regenerate-unicode-properties@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-7.0.0.tgz#107405afcc4a190ec5ed450ecaa00ed0cafa7a4c" - integrity sha512-s5NGghCE4itSlUS+0WUj88G6cfMVMmH8boTPNvABf8od+2dhT9WDlWu8n01raQAJZMOK8Ch6jSexaRO7swd6aw== - dependencies: - regenerate "^1.4.0" - -regenerate@^1.2.1, regenerate@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11" - integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg== - -regenerator-runtime@^0.11.0: - version "0.11.1" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" - integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== - -regenerator-runtime@^0.12.0: - version "0.12.1" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de" - integrity sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg== - -regex-not@^1.0.0, regex-not@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" - integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A== - dependencies: - extend-shallow "^3.0.2" - safe-regex "^1.1.0" - -regexp.prototype.flags@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75" - integrity sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ== - dependencies: - define-properties "^1.1.3" - es-abstract "^1.17.0-next.1" - -regexpu-core@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b" - integrity sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs= - dependencies: - regenerate "^1.2.1" - regjsgen "^0.2.0" - regjsparser "^0.1.4" - -regexpu-core@^4.2.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.4.0.tgz#8d43e0d1266883969720345e70c275ee0aec0d32" - integrity sha512-eDDWElbwwI3K0Lo6CqbQbA6FwgtCz4kYTarrri1okfkRLZAqstU+B3voZBCjg8Fl6iq0gXrJG6MvRgLthfvgOA== - dependencies: - regenerate "^1.4.0" - regenerate-unicode-properties "^7.0.0" - regjsgen "^0.5.0" - regjsparser "^0.6.0" - unicode-match-property-ecmascript "^1.0.4" - unicode-match-property-value-ecmascript "^1.0.2" - -registry-auth-token@^4.0.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.0.tgz#1d37dffda72bbecd0f581e4715540213a65eb7da" - integrity sha512-P+lWzPrsgfN+UEpDS3U8AQKg/UjZX6mQSJueZj3EK+vNESoqBSpBUD3gmu4sF9lOsjXWjF11dQKUqemf3veq1w== - dependencies: - rc "^1.2.8" - -registry-url@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009" - integrity sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw== - dependencies: - rc "^1.2.8" - -regjsgen@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7" - integrity sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc= - -regjsgen@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.0.tgz#a7634dc08f89209c2049adda3525711fb97265dd" - integrity sha512-RnIrLhrXCX5ow/E5/Mh2O4e/oa1/jW0eaBKTSy3LaCj+M3Bqvm97GWDp2yUtzIs4LEn65zR2yiYGFqb2ApnzDA== - -regjsparser@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c" - integrity sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw= - dependencies: - jsesc "~0.5.0" - -regjsparser@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.0.tgz#f1e6ae8b7da2bae96c99399b868cd6c933a2ba9c" - integrity sha512-RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ== - dependencies: - jsesc "~0.5.0" - -remove-trailing-separator@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" - integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8= - -repeat-element@^1.1.2: - version "1.1.3" - resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce" - integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g== - -repeat-string@^1.6.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" - integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= - -repeating@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda" - integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo= - dependencies: - is-finite "^1.0.0" - -replace-ext@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz#2d6d996d04a15855d967443631dd5f77825b016a" - integrity sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw== - -request-progress@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-2.0.1.tgz#5d36bb57961c673aa5b788dbc8141fdf23b44e08" - integrity sha1-XTa7V5YcZzqlt4jbyBQf3yO0Tgg= - dependencies: - throttleit "^1.0.0" - -request@^2.44.0, request@^2.83.0: - version "2.88.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef" - integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg== - dependencies: - aws-sign2 "~0.7.0" - aws4 "^1.8.0" - caseless "~0.12.0" - combined-stream "~1.0.6" - extend "~3.0.2" - forever-agent "~0.6.1" - form-data "~2.3.2" - har-validator "~5.1.0" - http-signature "~1.2.0" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.19" - oauth-sign "~0.9.0" - performance-now "^2.1.0" - qs "~6.5.2" - safe-buffer "^5.1.2" - tough-cookie "~2.4.3" - tunnel-agent "^0.6.0" - uuid "^3.3.2" - -request@^2.81.0, request@^2.87.0, request@^2.88.0: - version "2.88.2" - resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" - integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== - dependencies: - aws-sign2 "~0.7.0" - aws4 "^1.8.0" - caseless "~0.12.0" - combined-stream "~1.0.6" - extend "~3.0.2" - forever-agent "~0.6.1" - form-data "~2.3.2" - har-validator "~5.1.3" - http-signature "~1.2.0" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.19" - oauth-sign "~0.9.0" - performance-now "^2.1.0" - qs "~6.5.2" - safe-buffer "^5.1.2" - tough-cookie "~2.5.0" - tunnel-agent "^0.6.0" - uuid "^3.3.2" - -require-directory@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" - integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= - -require-from-string@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" - integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== - -require-main-filename@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" - integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE= - -require-main-filename@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" - integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg== - -reserved-words@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/reserved-words/-/reserved-words-0.1.2.tgz#00a0940f98cd501aeaaac316411d9adc52b31ab1" - integrity sha1-AKCUD5jNUBrqqsMWQR2a3FKzGrE= - -resolve-alpn@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.0.0.tgz#745ad60b3d6aff4b4a48e01b8c0bdc70959e0e8c" - integrity sha512-rTuiIEqFmGxne4IovivKSDzld2lWW9QCjqv80SYjPgf+gS35eaCAjaP54CCwGAwBtnCsvNLYtqxe1Nw+i6JEmA== - -resolve-dir@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43" - integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M= - dependencies: - expand-tilde "^2.0.0" - global-modules "^1.0.0" - -resolve-from@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748" - integrity sha1-six699nWiBvItuZTM17rywoYh0g= - -resolve-url@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" - integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= - -resolve@^1.10.0: - version "1.17.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444" - integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w== - dependencies: - path-parse "^1.0.6" - -resolve@^1.4.0, resolve@^1.5.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba" - integrity sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg== - dependencies: - path-parse "^1.0.6" - -responselike@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" - integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec= - dependencies: - lowercase-keys "^1.0.0" - -responselike@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.0.tgz#26391bcc3174f750f9a79eacc40a12a5c42d7723" - integrity sha512-xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw== - dependencies: - lowercase-keys "^2.0.0" - -restore-cursor@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e" - integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA== - dependencies: - onetime "^5.1.0" - signal-exit "^3.0.2" - -ret@~0.1.10: - version "0.1.15" - resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" - integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== - -reusify@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" - integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== - -rgb-regex@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/rgb-regex/-/rgb-regex-1.0.1.tgz#c0e0d6882df0e23be254a475e8edd41915feaeb1" - integrity sha1-wODWiC3w4jviVKR16O3UGRX+rrE= - -rgba-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3" - integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM= - -rimraf@2, rimraf@^2.6.3: - version "2.7.1" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" - integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== - dependencies: - glob "^7.1.3" - -rimraf@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" - integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== - dependencies: - glob "^7.1.3" - -roarr@^2.15.3: - version "2.15.4" - resolved "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz#f5fe795b7b838ccfe35dc608e0282b9eba2e7afd" - integrity sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A== - dependencies: - boolean "^3.0.1" - detect-node "^2.0.4" - globalthis "^1.0.1" - json-stringify-safe "^5.0.1" - semver-compare "^1.0.0" - sprintf-js "^1.1.2" - -rollup-plugin-buble@^0.19.2: - version "0.19.6" - resolved "https://registry.yarnpkg.com/rollup-plugin-buble/-/rollup-plugin-buble-0.19.6.tgz#55ee0995d8870d536f01f4277c3eef4276e8747e" - integrity sha512-El5Fut4/wEO17ZN/n9BZvqd7DXXB2WbJr/DKvr89LXChC/cHllE0XwiUDeAalrTkgr0WrnyLDTCQvEv+cGywWQ== - dependencies: - buble "^0.19.6" - rollup-pluginutils "^2.3.3" - -rollup-plugin-commonjs@^8.3.0: - version "8.4.1" - resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-8.4.1.tgz#5c9cea2b2c3de322f5fbccd147e07ed5e502d7a0" - integrity sha512-mg+WuD+jlwoo8bJtW3Mvx7Tz6TsIdMsdhuvCnDMoyjh0oxsVgsjB/N0X984RJCWwc5IIiqNVJhXeeITcc73++A== - dependencies: - acorn "^5.2.1" - estree-walker "^0.5.0" - magic-string "^0.22.4" - resolve "^1.4.0" - rollup-pluginutils "^2.0.1" - -rollup-plugin-multi-entry@^2.0.2: - version "2.1.0" - resolved "https://registry.yarnpkg.com/rollup-plugin-multi-entry/-/rollup-plugin-multi-entry-2.1.0.tgz#64a7287adfd437cab33bf6364a8d8ab1e7a7725d" - integrity sha512-YVVsI15uvbxMKdeYS5NXQa5zbVr/DYdDBBwseC80+KAc7mqDUjM6Qe4wl+jFucVw1yvBDZFk0PPSBZqoLq8xUA== - dependencies: - matched "^1.0.2" - -rollup-plugin-node-resolve@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-4.0.1.tgz#f95765d174e5daeef9ea6268566141f53aa9d422" - integrity sha512-fSS7YDuCe0gYqKsr5OvxMloeZYUSgN43Ypi1WeRZzQcWtHgFayV5tUSPYpxuaioIIWaBXl6NrVk0T2/sKwueLg== - dependencies: - builtin-modules "^3.0.0" - is-module "^1.0.0" - resolve "^1.10.0" - -rollup-plugin-postcss@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/rollup-plugin-postcss/-/rollup-plugin-postcss-2.0.3.tgz#1fd5b7e1fc7545cb0084d9c99d11b259e41a05e6" - integrity sha512-d12oKl6za/GGXmlytzVPzzTdPCKgti/Kq2kNhtfm5vv9hkNbyrTvizMBm6zZ5rRWX/sIWl3znjIJ8xy6Hofoeg== - dependencies: - chalk "^2.4.2" - concat-with-sourcemaps "^1.0.5" - cssnano "^4.1.8" - import-cwd "^2.1.0" - p-queue "^2.4.2" - pify "^3.0.0" - postcss "^7.0.14" - postcss-load-config "^2.0.0" - postcss-modules "^1.4.1" - promise.series "^0.2.0" - reserved-words "^0.1.2" - resolve "^1.5.0" - rollup-pluginutils "^2.0.1" - style-inject "^0.3.0" - -rollup-plugin-terser@^4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz#6f661ef284fa7c27963d242601691dc3d23f994e" - integrity sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg== +"promise-queue@^2.2.5": + "integrity" "sha1-L29ffA9tCBCelnZZx5uIqe1ek7Q=" + "resolved" "https://registry.npmjs.org/promise-queue/-/promise-queue-2.2.5.tgz" + "version" "2.2.5" + +"promise.series@^0.2.0": + "integrity" "sha1-LMfr6Vn8OmYZwEq029yeRS2GS70=" + "resolved" "https://registry.npmjs.org/promise.series/-/promise.series-0.2.0.tgz" + "version" "0.2.0" + +"promise@^7.1.1", "promise@>=3.2 <8": + "integrity" "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==" + "resolved" "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz" + "version" "7.3.1" + dependencies: + "asap" "~2.0.3" + +"proxy-addr@~2.0.5": + "integrity" "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==" + "resolved" "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz" + "version" "2.0.6" + dependencies: + "forwarded" "~0.1.2" + "ipaddr.js" "1.9.1" + +"proxy-from-env@^1.0.0": + "integrity" "sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4=" + "resolved" "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz" + "version" "1.0.0" + +"prr@~1.0.1": + "integrity" "sha1-0/wRS6BplaRexok/SEzrHXj19HY=" + "resolved" "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz" + "version" "1.0.1" + +"pseudomap@^1.0.2": + "integrity" "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" + "resolved" "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz" + "version" "1.0.2" + +"psl@^1.1.24", "psl@^1.1.28": + "integrity" "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==" + "resolved" "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz" + "version" "1.8.0" + +"pump@^2.0.0": + "integrity" "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==" + "resolved" "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz" + "version" "2.0.1" + dependencies: + "end-of-stream" "^1.1.0" + "once" "^1.3.1" + +"pump@^3.0.0": + "integrity" "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==" + "resolved" "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz" + "version" "3.0.0" + dependencies: + "end-of-stream" "^1.1.0" + "once" "^1.3.1" + +"pumpify@^1.3.3": + "integrity" "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==" + "resolved" "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz" + "version" "1.5.1" + dependencies: + "duplexify" "^3.6.0" + "inherits" "^2.0.3" + "pump" "^2.0.0" + +"punycode@^1.4.1": + "integrity" "sha1-wNWmOycYgArY4esPpSachN1BhF4=" + "resolved" "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz" + "version" "1.4.1" + +"punycode@^2.1.0", "punycode@^2.1.1": + "integrity" "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" + "resolved" "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz" + "version" "2.1.1" + +"pupa@^2.0.1": + "integrity" "sha512-hEJH0s8PXLY/cdXh66tNEQGndDrIKNqNC5xmrysZy3i5C3oEoLna7YAOad+7u125+zH1HNXUmGEkrhb3c2VriA==" + "resolved" "https://registry.npmjs.org/pupa/-/pupa-2.0.1.tgz" + "version" "2.0.1" + dependencies: + "escape-goat" "^2.0.0" + +"q@^1.1.2": + "integrity" "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=" + "resolved" "https://registry.npmjs.org/q/-/q-1.5.1.tgz" + "version" "1.5.1" + +"qs@^6.5.1", "qs@6.7.0": + "integrity" "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==" + "resolved" "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz" + "version" "6.7.0" + +"qs@~6.5.2": + "integrity" "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==" + "resolved" "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz" + "version" "6.5.2" + +"quagga@^0.12.1": + "integrity" "sha1-b0jFbtmS3F/euQ2+5wacLhzd6Lc=" + "resolved" "https://registry.npmjs.org/quagga/-/quagga-0.12.1.tgz" + "version" "0.12.1" + dependencies: + "get-pixels" "^3.2.3" + "gl-mat2" "^1.0.0" + "gl-vec2" "^1.0.0" + "gl-vec3" "^1.0.3" + "lodash" "^4.17.4" + "ndarray" "^1.0.18" + "ndarray-linear-interpolate" "^1.0.0" + +"querystring@^0.2.0": + "integrity" "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=" + "resolved" "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz" + "version" "0.2.0" + +"queue-microtask@^1.2.2": + "integrity" "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==" + "resolved" "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz" + "version" "1.2.3" + +"queue@^6.0.1": + "integrity" "sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA==" + "resolved" "https://registry.npmjs.org/queue/-/queue-6.0.2.tgz" + "version" "6.0.2" + dependencies: + "inherits" "~2.0.3" + +"quick-lru@^5.1.1": + "integrity" "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==" + "resolved" "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz" + "version" "5.1.1" + +"quill-delta@^3.6.2": + "integrity" "sha512-wdIGBlcX13tCHOXGMVnnTVFtGRLoP0imqxM696fIPwIf5ODIYUHIvHbZcyvGlZFiFhK5XzDC2lpjbxRhnM05Tg==" + "resolved" "https://registry.npmjs.org/quill-delta/-/quill-delta-3.6.3.tgz" + "version" "3.6.3" + dependencies: + "deep-equal" "^1.0.1" + "extend" "^3.0.2" + "fast-diff" "1.1.2" + +"quill-delta@4.2.1": + "integrity" "sha512-Y2nksOj6Q+4hizre8n0dml76vLNGK4/y86EoI1d7rv6EL1bx7DPDYRmqQMPu1UqFQO/uQuVHQ3fOmm4ZSzWrfA==" + "resolved" "https://registry.npmjs.org/quill-delta/-/quill-delta-4.2.1.tgz" + "version" "4.2.1" + dependencies: + "deep-equal" "^1.0.1" + "extend" "^3.0.2" + "fast-diff" "1.2.0" + +"quill-image-resize@^3.0.9": + "integrity" "sha512-5Dk0nixhbFsCwSWtPU9qqqtfM2gURfaP+pbBhQvAoMJoF4p99xbAibfAI3gsZJkbWUodoK2iAPf1V5oTSpv9ww==" + "resolved" "https://registry.npmjs.org/quill-image-resize/-/quill-image-resize-3.0.9.tgz" + "version" "3.0.9" + dependencies: + "lodash" "^4.17.4" + "quill" "^1.2.2" + "raw-loader" "^0.5.1" + +"quill@^1.2.2": + "integrity" "sha512-hG/DVzh/TiknWtE6QmWAF/pxoZKYxfe3J/d/+ShUWkDvvkZQVTPeVmUJVu1uE6DDooC4fWTiCLh84ul89oNz5g==" + "resolved" "https://registry.npmjs.org/quill/-/quill-1.3.7.tgz" + "version" "1.3.7" + dependencies: + "clone" "^2.1.1" + "deep-equal" "^1.0.1" + "eventemitter3" "^2.0.3" + "extend" "^3.0.2" + "parchment" "^1.1.4" + "quill-delta" "^3.6.2" + +"quill@2.0.0-dev.4": + "integrity" "sha512-9WmMVCEIhf3lDdhzl+i+GBDeDl0BFi65waC4Im8Y4HudEJ9kEEb1lciAz9A8pcDmLMjiMbvz84lNt/U5OBS8Vg==" + "resolved" "https://registry.npmjs.org/quill/-/quill-2.0.0-dev.4.tgz" + "version" "2.0.0-dev.4" + dependencies: + "clone" "^2.1.2" + "deep-equal" "^2.0.2" + "eventemitter3" "^4.0.0" + "extend" "^3.0.2" + "parchment" "2.0.0-dev.2" + "quill-delta" "4.2.1" + +"qz-tray@^2.0.8": + "integrity" "sha512-lncGYzz7/sTORZuC1S3ukNlMPCMOmsHWNvJF4FjMCZ2+0UV3txi6kgPd754B7kDFKm0J587sIODgxIlFY7qU4w==" + "resolved" "https://registry.npmjs.org/qz-tray/-/qz-tray-2.0.8.tgz" + "version" "2.0.8" + +"range-parser@~1.2.1": + "integrity" "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" + "resolved" "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz" + "version" "1.2.1" + +"rangetouch@^2.0.1": + "integrity" "sha512-sln+pNSc8NGaHoLzwNBssFSf/rSYkqeBXzX1AtJlkJiUaVSJSbRAWJk+4omsXkN+EJalzkZhWQ3th1m0FpR5xA==" + "resolved" "https://registry.npmjs.org/rangetouch/-/rangetouch-2.0.1.tgz" + "version" "2.0.1" + +"raw-body@2.4.0": + "integrity" "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==" + "resolved" "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz" + "version" "2.4.0" + dependencies: + "bytes" "3.1.0" + "http-errors" "1.7.2" + "iconv-lite" "0.4.24" + "unpipe" "1.0.0" + +"raw-loader@^0.5.1": + "integrity" "sha1-DD0L6u2KAclm2Xh793goElKpeao=" + "resolved" "https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz" + "version" "0.5.1" + +"rc@^1.2.8": + "integrity" "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==" + "resolved" "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz" + "version" "1.2.8" + dependencies: + "deep-extend" "^0.6.0" + "ini" "~1.3.0" + "minimist" "^1.2.0" + "strip-json-comments" "~2.0.1" + +"read-pkg-up@^1.0.1": + "integrity" "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=" + "resolved" "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz" + "version" "1.0.1" + dependencies: + "find-up" "^1.0.0" + "read-pkg" "^1.0.0" + +"read-pkg@^1.0.0": + "integrity" "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=" + "resolved" "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz" + "version" "1.1.0" + dependencies: + "load-json-file" "^1.0.0" + "normalize-package-data" "^2.3.2" + "path-type" "^1.0.0" + +"readable-stream@^2.0.0", "readable-stream@^2.0.1", "readable-stream@^2.0.6", "readable-stream@^2.2.2", "readable-stream@^2.3.5", "readable-stream@^2.3.7", "readable-stream@~2.3.6": + "integrity" "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==" + "resolved" "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz" + "version" "2.3.7" + dependencies: + "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" + +"readable-stream@^3.0.1", "readable-stream@^3.1.1", "readable-stream@^3.4.0": + "integrity" "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==" + "resolved" "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz" + "version" "3.6.0" + dependencies: + "inherits" "^2.0.3" + "string_decoder" "^1.1.1" + "util-deprecate" "^1.0.1" + +"readable-stream@^3.5.0": + "integrity" "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==" + "resolved" "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz" + "version" "3.6.0" + dependencies: + "inherits" "^2.0.3" + "string_decoder" "^1.1.1" + "util-deprecate" "^1.0.1" + +"redent@^1.0.0": + "integrity" "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=" + "resolved" "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz" + "version" "1.0.0" + dependencies: + "indent-string" "^2.1.0" + "strip-indent" "^1.0.1" + +"redis-commands@^1.7.0": + "integrity" "sha512-nJWqw3bTFy21hX/CPKHth6sfhZbdiHP6bTawSgQBlKOVRG7EZkfHbbHwQJnrE4vsQf0CMNE+3gJ4Fmm16vdVlQ==" + "resolved" "https://registry.npmjs.org/redis-commands/-/redis-commands-1.7.0.tgz" + "version" "1.7.0" + +"redis-errors@^1.0.0", "redis-errors@^1.2.0": + "integrity" "sha1-62LSrbFeTq9GEMBK/hUpOEJQq60=" + "resolved" "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz" + "version" "1.2.0" + +"redis-parser@^3.0.0": + "integrity" "sha1-tm2CjNyv5rS4pCin3vTGvKwxyLQ=" + "resolved" "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz" + "version" "3.0.0" + dependencies: + "redis-errors" "^1.0.0" + +"redis@^3.1.1": + "integrity" "sha512-QhkKhOuzhogR1NDJfBD34TQJz2ZJwDhhIC6ZmvpftlmfYShHHQXjjNspAJ+Z2HH5NwSBVYBVganbiZ8bgFMHjg==" + "resolved" "https://registry.npmjs.org/redis/-/redis-3.1.1.tgz" + "version" "3.1.1" + dependencies: + "denque" "^1.5.0" + "redis-commands" "^1.7.0" + "redis-errors" "^1.2.0" + "redis-parser" "^3.0.0" + +"regenerate-unicode-properties@^7.0.0": + "integrity" "sha512-s5NGghCE4itSlUS+0WUj88G6cfMVMmH8boTPNvABf8od+2dhT9WDlWu8n01raQAJZMOK8Ch6jSexaRO7swd6aw==" + "resolved" "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-7.0.0.tgz" + "version" "7.0.0" + dependencies: + "regenerate" "^1.4.0" + +"regenerate@^1.2.1", "regenerate@^1.4.0": + "integrity" "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==" + "resolved" "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz" + "version" "1.4.0" + +"regenerator-runtime@^0.11.0": + "integrity" "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==" + "resolved" "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz" + "version" "0.11.1" + +"regenerator-runtime@^0.12.0": + "integrity" "sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==" + "resolved" "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz" + "version" "0.12.1" + +"regex-not@^1.0.0", "regex-not@^1.0.2": + "integrity" "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==" + "resolved" "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz" + "version" "1.0.2" + dependencies: + "extend-shallow" "^3.0.2" + "safe-regex" "^1.1.0" + +"regexp.prototype.flags@^1.3.0": + "integrity" "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==" + "resolved" "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz" + "version" "1.3.0" + dependencies: + "define-properties" "^1.1.3" + "es-abstract" "^1.17.0-next.1" + +"regexpu-core@^1.0.0": + "integrity" "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=" + "resolved" "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz" + "version" "1.0.0" + dependencies: + "regenerate" "^1.2.1" + "regjsgen" "^0.2.0" + "regjsparser" "^0.1.4" + +"regexpu-core@^4.2.0": + "integrity" "sha512-eDDWElbwwI3K0Lo6CqbQbA6FwgtCz4kYTarrri1okfkRLZAqstU+B3voZBCjg8Fl6iq0gXrJG6MvRgLthfvgOA==" + "resolved" "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.4.0.tgz" + "version" "4.4.0" + dependencies: + "regenerate" "^1.4.0" + "regenerate-unicode-properties" "^7.0.0" + "regjsgen" "^0.5.0" + "regjsparser" "^0.6.0" + "unicode-match-property-ecmascript" "^1.0.4" + "unicode-match-property-value-ecmascript" "^1.0.2" + +"registry-auth-token@^4.0.0": + "integrity" "sha512-P+lWzPrsgfN+UEpDS3U8AQKg/UjZX6mQSJueZj3EK+vNESoqBSpBUD3gmu4sF9lOsjXWjF11dQKUqemf3veq1w==" + "resolved" "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.0.tgz" + "version" "4.2.0" + dependencies: + "rc" "^1.2.8" + +"registry-url@^5.0.0": + "integrity" "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==" + "resolved" "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz" + "version" "5.1.0" + dependencies: + "rc" "^1.2.8" + +"regjsgen@^0.2.0": + "integrity" "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=" + "resolved" "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz" + "version" "0.2.0" + +"regjsgen@^0.5.0": + "integrity" "sha512-RnIrLhrXCX5ow/E5/Mh2O4e/oa1/jW0eaBKTSy3LaCj+M3Bqvm97GWDp2yUtzIs4LEn65zR2yiYGFqb2ApnzDA==" + "resolved" "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.0.tgz" + "version" "0.5.0" + +"regjsparser@^0.1.4": + "integrity" "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=" + "resolved" "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz" + "version" "0.1.5" + dependencies: + "jsesc" "~0.5.0" + +"regjsparser@^0.6.0": + "integrity" "sha512-RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ==" + "resolved" "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.0.tgz" + "version" "0.6.0" + dependencies: + "jsesc" "~0.5.0" + +"remove-trailing-separator@^1.0.1": + "integrity" "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=" + "resolved" "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz" + "version" "1.1.0" + +"repeat-element@^1.1.2": + "integrity" "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==" + "resolved" "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz" + "version" "1.1.3" + +"repeat-string@^1.6.1": + "integrity" "sha1-jcrkcOHIirwtYA//Sndihtp15jc=" + "resolved" "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz" + "version" "1.6.1" + +"repeating@^2.0.0": + "integrity" "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=" + "resolved" "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz" + "version" "2.0.1" + dependencies: + "is-finite" "^1.0.0" + +"replace-ext@^1.0.0": + "integrity" "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==" + "resolved" "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz" + "version" "1.0.1" + +"request-progress@^2.0.1": + "integrity" "sha1-XTa7V5YcZzqlt4jbyBQf3yO0Tgg=" + "resolved" "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz" + "version" "2.0.1" + dependencies: + "throttleit" "^1.0.0" + +"request@^2.44.0": + "integrity" "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==" + "resolved" "https://registry.npmjs.org/request/-/request-2.88.0.tgz" + "version" "2.88.0" + dependencies: + "aws-sign2" "~0.7.0" + "aws4" "^1.8.0" + "caseless" "~0.12.0" + "combined-stream" "~1.0.6" + "extend" "~3.0.2" + "forever-agent" "~0.6.1" + "form-data" "~2.3.2" + "har-validator" "~5.1.0" + "http-signature" "~1.2.0" + "is-typedarray" "~1.0.0" + "isstream" "~0.1.2" + "json-stringify-safe" "~5.0.1" + "mime-types" "~2.1.19" + "oauth-sign" "~0.9.0" + "performance-now" "^2.1.0" + "qs" "~6.5.2" + "safe-buffer" "^5.1.2" + "tough-cookie" "~2.4.3" + "tunnel-agent" "^0.6.0" + "uuid" "^3.3.2" + +"request@^2.81.0", "request@^2.87.0", "request@^2.88.0": + "integrity" "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==" + "resolved" "https://registry.npmjs.org/request/-/request-2.88.2.tgz" + "version" "2.88.2" + dependencies: + "aws-sign2" "~0.7.0" + "aws4" "^1.8.0" + "caseless" "~0.12.0" + "combined-stream" "~1.0.6" + "extend" "~3.0.2" + "forever-agent" "~0.6.1" + "form-data" "~2.3.2" + "har-validator" "~5.1.3" + "http-signature" "~1.2.0" + "is-typedarray" "~1.0.0" + "isstream" "~0.1.2" + "json-stringify-safe" "~5.0.1" + "mime-types" "~2.1.19" + "oauth-sign" "~0.9.0" + "performance-now" "^2.1.0" + "qs" "~6.5.2" + "safe-buffer" "^5.1.2" + "tough-cookie" "~2.5.0" + "tunnel-agent" "^0.6.0" + "uuid" "^3.3.2" + +"request@^2.83.0": + "integrity" "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==" + "resolved" "https://registry.npmjs.org/request/-/request-2.88.0.tgz" + "version" "2.88.0" + dependencies: + "aws-sign2" "~0.7.0" + "aws4" "^1.8.0" + "caseless" "~0.12.0" + "combined-stream" "~1.0.6" + "extend" "~3.0.2" + "forever-agent" "~0.6.1" + "form-data" "~2.3.2" + "har-validator" "~5.1.0" + "http-signature" "~1.2.0" + "is-typedarray" "~1.0.0" + "isstream" "~0.1.2" + "json-stringify-safe" "~5.0.1" + "mime-types" "~2.1.19" + "oauth-sign" "~0.9.0" + "performance-now" "^2.1.0" + "qs" "~6.5.2" + "safe-buffer" "^5.1.2" + "tough-cookie" "~2.4.3" + "tunnel-agent" "^0.6.0" + "uuid" "^3.3.2" + +"require-directory@^2.1.1": + "integrity" "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" + "resolved" "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz" + "version" "2.1.1" + +"require-from-string@^2.0.1": + "integrity" "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==" + "resolved" "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz" + "version" "2.0.2" + +"require-main-filename@^1.0.1": + "integrity" "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=" + "resolved" "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz" + "version" "1.0.1" + +"require-main-filename@^2.0.0": + "integrity" "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==" + "resolved" "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz" + "version" "2.0.0" + +"reserved-words@^0.1.2": + "integrity" "sha1-AKCUD5jNUBrqqsMWQR2a3FKzGrE=" + "resolved" "https://registry.npmjs.org/reserved-words/-/reserved-words-0.1.2.tgz" + "version" "0.1.2" + +"resolve-alpn@^1.0.0": + "integrity" "sha512-rTuiIEqFmGxne4IovivKSDzld2lWW9QCjqv80SYjPgf+gS35eaCAjaP54CCwGAwBtnCsvNLYtqxe1Nw+i6JEmA==" + "resolved" "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.0.0.tgz" + "version" "1.0.0" + +"resolve-dir@^1.0.0": + "integrity" "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=" + "resolved" "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz" + "version" "1.0.1" + dependencies: + "expand-tilde" "^2.0.0" + "global-modules" "^1.0.0" + +"resolve-from@^3.0.0": + "integrity" "sha1-six699nWiBvItuZTM17rywoYh0g=" + "resolved" "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz" + "version" "3.0.0" + +"resolve-url@^0.2.1": + "integrity" "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=" + "resolved" "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz" + "version" "0.2.1" + +"resolve@^1.10.0": + "integrity" "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==" + "resolved" "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz" + "version" "1.17.0" + dependencies: + "path-parse" "^1.0.6" + +"resolve@^1.4.0", "resolve@^1.5.0": + "integrity" "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==" + "resolved" "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz" + "version" "1.10.0" + dependencies: + "path-parse" "^1.0.6" + +"responselike@^1.0.2": + "integrity" "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=" + "resolved" "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz" + "version" "1.0.2" + dependencies: + "lowercase-keys" "^1.0.0" + +"responselike@^2.0.0": + "integrity" "sha512-xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw==" + "resolved" "https://registry.npmjs.org/responselike/-/responselike-2.0.0.tgz" + "version" "2.0.0" + dependencies: + "lowercase-keys" "^2.0.0" + +"restore-cursor@^3.1.0": + "integrity" "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==" + "resolved" "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz" + "version" "3.1.0" + dependencies: + "onetime" "^5.1.0" + "signal-exit" "^3.0.2" + +"ret@~0.1.10": + "integrity" "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==" + "resolved" "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz" + "version" "0.1.15" + +"reusify@^1.0.4": + "integrity" "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==" + "resolved" "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz" + "version" "1.0.4" + +"rgb-regex@^1.0.1": + "integrity" "sha1-wODWiC3w4jviVKR16O3UGRX+rrE=" + "resolved" "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz" + "version" "1.0.1" + +"rgba-regex@^1.0.0": + "integrity" "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=" + "resolved" "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz" + "version" "1.0.0" + +"rimraf@^2.6.3", "rimraf@2": + "integrity" "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==" + "resolved" "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz" + "version" "2.7.1" + dependencies: + "glob" "^7.1.3" + +"rimraf@^3.0.0": + "integrity" "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==" + "resolved" "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz" + "version" "3.0.2" + dependencies: + "glob" "^7.1.3" + +"roarr@^2.15.3": + "integrity" "sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==" + "resolved" "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz" + "version" "2.15.4" + dependencies: + "boolean" "^3.0.1" + "detect-node" "^2.0.4" + "globalthis" "^1.0.1" + "json-stringify-safe" "^5.0.1" + "semver-compare" "^1.0.0" + "sprintf-js" "^1.1.2" + +"rollup-plugin-buble@^0.19.2": + "integrity" "sha512-El5Fut4/wEO17ZN/n9BZvqd7DXXB2WbJr/DKvr89LXChC/cHllE0XwiUDeAalrTkgr0WrnyLDTCQvEv+cGywWQ==" + "resolved" "https://registry.npmjs.org/rollup-plugin-buble/-/rollup-plugin-buble-0.19.6.tgz" + "version" "0.19.6" + dependencies: + "buble" "^0.19.6" + "rollup-pluginutils" "^2.3.3" + +"rollup-plugin-commonjs@^8.3.0": + "integrity" "sha512-mg+WuD+jlwoo8bJtW3Mvx7Tz6TsIdMsdhuvCnDMoyjh0oxsVgsjB/N0X984RJCWwc5IIiqNVJhXeeITcc73++A==" + "resolved" "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-8.4.1.tgz" + "version" "8.4.1" + dependencies: + "acorn" "^5.2.1" + "estree-walker" "^0.5.0" + "magic-string" "^0.22.4" + "resolve" "^1.4.0" + "rollup-pluginutils" "^2.0.1" + +"rollup-plugin-multi-entry@^2.0.2": + "integrity" "sha512-YVVsI15uvbxMKdeYS5NXQa5zbVr/DYdDBBwseC80+KAc7mqDUjM6Qe4wl+jFucVw1yvBDZFk0PPSBZqoLq8xUA==" + "resolved" "https://registry.npmjs.org/rollup-plugin-multi-entry/-/rollup-plugin-multi-entry-2.1.0.tgz" + "version" "2.1.0" + dependencies: + "matched" "^1.0.2" + +"rollup-plugin-node-resolve@^4.0.1": + "integrity" "sha512-fSS7YDuCe0gYqKsr5OvxMloeZYUSgN43Ypi1WeRZzQcWtHgFayV5tUSPYpxuaioIIWaBXl6NrVk0T2/sKwueLg==" + "resolved" "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-4.0.1.tgz" + "version" "4.0.1" + dependencies: + "builtin-modules" "^3.0.0" + "is-module" "^1.0.0" + "resolve" "^1.10.0" + +"rollup-plugin-postcss@^2.0.3": + "integrity" "sha512-d12oKl6za/GGXmlytzVPzzTdPCKgti/Kq2kNhtfm5vv9hkNbyrTvizMBm6zZ5rRWX/sIWl3znjIJ8xy6Hofoeg==" + "resolved" "https://registry.npmjs.org/rollup-plugin-postcss/-/rollup-plugin-postcss-2.0.3.tgz" + "version" "2.0.3" + dependencies: + "chalk" "^2.4.2" + "concat-with-sourcemaps" "^1.0.5" + "cssnano" "^4.1.8" + "import-cwd" "^2.1.0" + "p-queue" "^2.4.2" + "pify" "^3.0.0" + "postcss" "^7.0.14" + "postcss-load-config" "^2.0.0" + "postcss-modules" "^1.4.1" + "promise.series" "^0.2.0" + "reserved-words" "^0.1.2" + "resolve" "^1.5.0" + "rollup-pluginutils" "^2.0.1" + "style-inject" "^0.3.0" + +"rollup-plugin-terser@^4.0.4": + "integrity" "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==" + "resolved" "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz" + "version" "4.0.4" dependencies: "@babel/code-frame" "^7.0.0" - jest-worker "^24.0.0" - serialize-javascript "^1.6.1" - terser "^3.14.1" + "jest-worker" "^24.0.0" + "serialize-javascript" "^1.6.1" + "terser" "^3.14.1" -rollup-plugin-vue@4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/rollup-plugin-vue/-/rollup-plugin-vue-4.2.0.tgz#83cf392c5e929c34d5f4992e75c2ed32aa600c09" - integrity sha512-n8NDvhYtA9HC3hRyLNAV+0Ei4FHlaOB8LoiXxVwYclgHxOR4aku57zIw8EPf+ETSf45w49UP4VUXgpX6XNwdOA== +"rollup-plugin-vue@4.2.0": + "integrity" "sha512-n8NDvhYtA9HC3hRyLNAV+0Ei4FHlaOB8LoiXxVwYclgHxOR4aku57zIw8EPf+ETSf45w49UP4VUXgpX6XNwdOA==" + "resolved" "https://registry.npmjs.org/rollup-plugin-vue/-/rollup-plugin-vue-4.2.0.tgz" + "version" "4.2.0" dependencies: "@babel/runtime" "^7.0.0-beta.46" "@vue/component-compiler" "^3.3.2" "@vue/component-compiler-utils" "^1.2.1" - debug "^2.6.0" - hash-sum "^1.0.2" - postcss "^6.0.22" - querystring "^0.2.0" - rollup-pluginutils "^2.0.1" + "debug" "^2.6.0" + "hash-sum" "^1.0.2" + "postcss" "^6.0.22" + "querystring" "^0.2.0" + "rollup-pluginutils" "^2.0.1" -rollup-pluginutils@^2.0.1, rollup-pluginutils@^2.3.3: - version "2.4.1" - resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.4.1.tgz#de43ab54965bbf47843599a7f3adceb723de38db" - integrity sha512-wesMQ9/172IJDIW/lYWm0vW0LiKe5Ekjws481R7z9WTRtmO59cqyM/2uUlxvf6yzm/fElFmHUobeQOYz46dZJw== +"rollup-pluginutils@^2.0.1", "rollup-pluginutils@^2.3.3": + "integrity" "sha512-wesMQ9/172IJDIW/lYWm0vW0LiKe5Ekjws481R7z9WTRtmO59cqyM/2uUlxvf6yzm/fElFmHUobeQOYz46dZJw==" + "resolved" "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.4.1.tgz" + "version" "2.4.1" dependencies: - estree-walker "^0.6.0" - micromatch "^3.1.10" + "estree-walker" "^0.6.0" + "micromatch" "^3.1.10" -rollup@^1.2.2: - version "1.4.1" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.4.1.tgz#cc03ef6fb49dd72a878e3da0131c0a3696de14a7" - integrity sha512-YWf5zeR6SWtqZmCnuYs4a+ZJetj8NT4yfBMPXekWHW4L3144jM+J2AWagQVejB0FwCqjEUP9l8o4hg1rPDfQlg== +"rollup@^1.2.2", "rollup@>=0.66.0 <2": + "integrity" "sha512-YWf5zeR6SWtqZmCnuYs4a+ZJetj8NT4yfBMPXekWHW4L3144jM+J2AWagQVejB0FwCqjEUP9l8o4hg1rPDfQlg==" + "resolved" "https://registry.npmjs.org/rollup/-/rollup-1.4.1.tgz" + "version" "1.4.1" dependencies: "@types/estree" "0.0.39" "@types/node" "^11.9.5" - acorn "^6.1.1" - -run-async@^2.4.0: - version "2.4.1" - resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455" - integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ== - -run-parallel@^1.1.9: - version "1.2.0" - resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" - integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== - dependencies: - queue-microtask "^1.2.2" - -rxjs@^6.6.0: - version "6.6.3" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz#8ca84635c4daa900c0d3967a6ee7ac60271ee552" - integrity sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ== - dependencies: - tslib "^1.9.0" - -safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" - integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== - -safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" - integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== - -safe-regex@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" - integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4= - dependencies: - ret "~0.1.10" - -"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: - version "2.1.2" - resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" - integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== - -sass-graph@2.2.5: - version "2.2.5" - resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.5.tgz#a981c87446b8319d96dce0671e487879bd24c2e8" - integrity sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag== - dependencies: - glob "^7.0.0" - lodash "^4.0.0" - scss-tokenizer "^0.2.3" - yargs "^13.3.2" - -sax@>=0.6.0, sax@^1.2.4, sax@~1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" - integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== - -scss-tokenizer@^0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1" - integrity sha1-jrBtualyMzOCTT9VMGQRSYR85dE= - dependencies: - js-base64 "^2.1.8" - source-map "^0.4.2" - -semver-compare@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" - integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w= - -semver-diff@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b" - integrity sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg== - dependencies: - semver "^6.3.0" - -"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0, semver@^5.5.1: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== - -semver@^6.0.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== - -semver@^7.0.0, semver@^7.3.2, semver@^7.3.4: - version "7.3.5" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" - integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== - dependencies: - lru-cache "^6.0.0" - -semver@~5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" - integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8= - -send@0.17.1: - version "0.17.1" - resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" - integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg== - dependencies: - debug "2.6.9" - depd "~1.1.2" - destroy "~1.0.4" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - fresh "0.5.2" - http-errors "~1.7.2" - mime "1.6.0" - ms "2.1.1" - on-finished "~2.3.0" - range-parser "~1.2.1" - statuses "~1.5.0" - -serialize-error@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz#f1360b0447f61ffb483ec4157c737fab7d778e18" - integrity sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw== - dependencies: - type-fest "^0.13.1" - -serialize-javascript@^1.6.1: - version "1.7.0" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.7.0.tgz#d6e0dfb2a3832a8c94468e6eb1db97e55a192a65" - integrity sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA== - -serve-static@1.14.1: - version "1.14.1" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9" - integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg== - dependencies: - encodeurl "~1.0.2" - escape-html "~1.0.3" - parseurl "~1.3.3" - send "0.17.1" - -set-blocking@^2.0.0, set-blocking@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" - integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= - -set-immediate-shim@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61" - integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E= - -set-value@^0.4.3: - version "0.4.3" - resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1" - integrity sha1-fbCPnT0i3H945Trzw79GZuzfzPE= - dependencies: - extend-shallow "^2.0.1" - is-extendable "^0.1.1" - is-plain-object "^2.0.1" - to-object-path "^0.3.0" - -set-value@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274" - integrity sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg== - dependencies: - extend-shallow "^2.0.1" - is-extendable "^0.1.1" - is-plain-object "^2.0.3" - split-string "^3.0.1" - -setprototypeof@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" - integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== - -shebang-command@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" - integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= - dependencies: - shebang-regex "^1.0.0" - -shebang-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" - integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= - -should-equal@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/should-equal/-/should-equal-2.0.0.tgz#6072cf83047360867e68e98b09d71143d04ee0c3" - integrity sha512-ZP36TMrK9euEuWQYBig9W55WPC7uo37qzAEmbjHz4gfyuXrEUgF8cUvQVO+w+d3OMfPvSRQJ22lSm8MQJ43LTA== - dependencies: - should-type "^1.4.0" - -should-format@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/should-format/-/should-format-3.0.3.tgz#9bfc8f74fa39205c53d38c34d717303e277124f1" - integrity sha1-m/yPdPo5IFxT04w01xcwPidxJPE= - dependencies: - should-type "^1.3.0" - should-type-adaptors "^1.0.1" - -should-type-adaptors@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/should-type-adaptors/-/should-type-adaptors-1.1.0.tgz#401e7f33b5533033944d5cd8bf2b65027792e27a" - integrity sha512-JA4hdoLnN+kebEp2Vs8eBe9g7uy0zbRo+RMcU0EsNy+R+k049Ki+N5tT5Jagst2g7EAja+euFuoXFCa8vIklfA== - dependencies: - should-type "^1.3.0" - should-util "^1.0.0" - -should-type@^1.3.0, should-type@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/should-type/-/should-type-1.4.0.tgz#0756d8ce846dfd09843a6947719dfa0d4cff5cf3" - integrity sha1-B1bYzoRt/QmEOmlHcZ36DUz/XPM= - -should-util@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/should-util/-/should-util-1.0.1.tgz#fb0d71338f532a3a149213639e2d32cbea8bcb28" - integrity sha512-oXF8tfxx5cDk8r2kYqlkUJzZpDBqVY/II2WhvU0n9Y3XYvAYRmeaf1PvvIvTgPnv4KJ+ES5M0PyDq5Jp+Ygy2g== - -should@^13.2.3: - version "13.2.3" - resolved "https://registry.yarnpkg.com/should/-/should-13.2.3.tgz#96d8e5acf3e97b49d89b51feaa5ae8d07ef58f10" - integrity sha512-ggLesLtu2xp+ZxI+ysJTmNjh2U0TsC+rQ/pfED9bUZZ4DKefP27D+7YJVVTvKsmjLpIi9jAa7itwDGkDDmt1GQ== - dependencies: - 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" - -showdown@^1.9.1: - version "1.9.1" - resolved "https://registry.yarnpkg.com/showdown/-/showdown-1.9.1.tgz#134e148e75cd4623e09c21b0511977d79b5ad0ef" - integrity sha512-9cGuS382HcvExtf5AHk7Cb4pAeQQ+h0eTr33V1mu+crYWV4KvWAw6el92bDrqGEk5d46Ai/fhbEUwqJ/mTCNEA== - dependencies: - yargs "^14.2" - -side-channel@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.2.tgz#df5d1abadb4e4bf4af1cd8852bf132d2f7876947" - integrity sha512-7rL9YlPHg7Ancea1S96Pa8/QWb4BtXL/TZvS6B8XFetGBeuhAsfmUspK6DokBeZ64+Kj9TCNRD/30pVz1BvQNA== - dependencies: - es-abstract "^1.17.0-next.1" - object-inspect "^1.7.0" - -signal-exit@^3.0.0: - version "3.0.3" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" - integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== - -signal-exit@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" - integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= - -simple-swizzle@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a" - integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo= - dependencies: - is-arrayish "^0.3.1" - -snapdragon-node@^2.0.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" - integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw== - dependencies: - define-property "^1.0.0" - isobject "^3.0.0" - snapdragon-util "^3.0.1" - -snapdragon-util@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2" - integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ== - dependencies: - kind-of "^3.2.0" - -snapdragon@^0.8.1: - version "0.8.2" - resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d" - integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg== - dependencies: - base "^0.11.1" - debug "^2.2.0" - define-property "^0.2.5" - extend-shallow "^2.0.1" - map-cache "^0.2.2" - source-map "^0.5.6" - source-map-resolve "^0.5.0" - use "^3.1.0" - -snyk-config@4.0.0, snyk-config@^4.0.0-rc.2: - version "4.0.0" - resolved "https://registry.yarnpkg.com/snyk-config/-/snyk-config-4.0.0.tgz#21d459f19087991246cc07a7ffb4501dce6f4159" - integrity sha512-E6jNe0oUjjzVASWBOAc/mA23DhbzABDF9MI6UZvl0gylh2NSXSXw2/LjlqMNOKL2c1qkbSkzLOdIX5XACoLCAQ== - dependencies: - async "^3.2.0" - debug "^4.1.1" - lodash.merge "^4.6.2" - minimist "^1.2.5" - -snyk-cpp-plugin@2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/snyk-cpp-plugin/-/snyk-cpp-plugin-2.2.1.tgz#55891511a43a6448e5a7c836a94f66f70fa705eb" - integrity sha512-NFwVLMCqKTocY66gcim0ukF6e31VRDJqDapg5sy3vCHqlD1OCNUXSK/aI4VQEEndDrsnFmQepsL5KpEU0dDRIQ== + "acorn" "^6.1.1" + +"run-async@^2.4.0": + "integrity" "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==" + "resolved" "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz" + "version" "2.4.1" + +"run-parallel@^1.1.9": + "integrity" "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==" + "resolved" "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz" + "version" "1.2.0" + dependencies: + "queue-microtask" "^1.2.2" + +"rxjs@^6.6.0": + "integrity" "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==" + "resolved" "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz" + "version" "6.6.3" + dependencies: + "tslib" "^1.9.0" + +"safe-buffer@^5.0.1": + "integrity" "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" + "resolved" "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz" + "version" "5.2.1" + +"safe-buffer@^5.1.2": + "integrity" "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" + "resolved" "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz" + "version" "5.2.1" + +"safe-buffer@~5.1.0", "safe-buffer@~5.1.1", "safe-buffer@5.1.2": + "integrity" "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + "resolved" "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz" + "version" "5.1.2" + +"safe-buffer@~5.2.0": + "integrity" "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" + "resolved" "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz" + "version" "5.2.1" + +"safe-regex@^1.1.0": + "integrity" "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=" + "resolved" "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz" + "version" "1.1.0" + dependencies: + "ret" "~0.1.10" + +"safer-buffer@^2.0.2", "safer-buffer@^2.1.0", "safer-buffer@>= 2.1.2 < 3", "safer-buffer@~2.1.0": + "integrity" "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + "resolved" "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz" + "version" "2.1.2" + +"sass-graph@2.2.5": + "integrity" "sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==" + "resolved" "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.5.tgz" + "version" "2.2.5" + dependencies: + "glob" "^7.0.0" + "lodash" "^4.0.0" + "scss-tokenizer" "^0.2.3" + "yargs" "^13.3.2" + +"sax@^1.2.4", "sax@>=0.6.0", "sax@~1.2.4": + "integrity" "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" + "resolved" "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz" + "version" "1.2.4" + +"scss-tokenizer@^0.2.3": + "integrity" "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=" + "resolved" "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz" + "version" "0.2.3" + dependencies: + "js-base64" "^2.1.8" + "source-map" "^0.4.2" + +"semver-compare@^1.0.0": + "integrity" "sha1-De4hahyUGrN+nvsXiPavxf9VN/w=" + "resolved" "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz" + "version" "1.0.0" + +"semver-diff@^3.1.1": + "integrity" "sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==" + "resolved" "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz" + "version" "3.1.1" + dependencies: + "semver" "^6.3.0" + +"semver@^5.3.0": + "integrity" "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + "resolved" "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz" + "version" "5.7.1" + +"semver@^5.5.0": + "integrity" "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + "resolved" "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz" + "version" "5.7.1" + +"semver@^5.5.1": + "integrity" "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + "resolved" "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz" + "version" "5.7.1" + +"semver@^6.0.0", "semver@^6.1.2", "semver@^6.2.0", "semver@^6.3.0": + "integrity" "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "resolved" "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz" + "version" "6.3.0" + +"semver@^7.0.0": + "integrity" "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==" + "resolved" "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz" + "version" "7.3.5" + dependencies: + "lru-cache" "^6.0.0" + +"semver@^7.3.2": + "integrity" "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==" + "resolved" "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz" + "version" "7.3.5" + dependencies: + "lru-cache" "^6.0.0" + +"semver@^7.3.4": + "integrity" "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==" + "resolved" "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz" + "version" "7.3.5" + dependencies: + "lru-cache" "^6.0.0" + +"semver@~5.3.0": + "integrity" "sha1-myzl094C0XxgEq0yaqa00M9U+U8=" + "resolved" "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz" + "version" "5.3.0" + +"semver@2 || 3 || 4 || 5": + "integrity" "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + "resolved" "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz" + "version" "5.7.1" + +"send@0.17.1": + "integrity" "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==" + "resolved" "https://registry.npmjs.org/send/-/send-0.17.1.tgz" + "version" "0.17.1" + dependencies: + "debug" "2.6.9" + "depd" "~1.1.2" + "destroy" "~1.0.4" + "encodeurl" "~1.0.2" + "escape-html" "~1.0.3" + "etag" "~1.8.1" + "fresh" "0.5.2" + "http-errors" "~1.7.2" + "mime" "1.6.0" + "ms" "2.1.1" + "on-finished" "~2.3.0" + "range-parser" "~1.2.1" + "statuses" "~1.5.0" + +"serialize-error@^7.0.1": + "integrity" "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==" + "resolved" "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz" + "version" "7.0.1" + dependencies: + "type-fest" "^0.13.1" + +"serialize-javascript@^1.6.1": + "integrity" "sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==" + "resolved" "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.1.tgz" + "version" "1.9.1" + +"serve-static@1.14.1": + "integrity" "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==" + "resolved" "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz" + "version" "1.14.1" + dependencies: + "encodeurl" "~1.0.2" + "escape-html" "~1.0.3" + "parseurl" "~1.3.3" + "send" "0.17.1" + +"set-blocking@^2.0.0", "set-blocking@~2.0.0": + "integrity" "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" + "resolved" "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz" + "version" "2.0.0" + +"set-immediate-shim@~1.0.1": + "integrity" "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=" + "resolved" "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz" + "version" "1.0.1" + +"set-value@^2.0.0", "set-value@^2.0.1": + "integrity" "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==" + "resolved" "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz" + "version" "2.0.1" + dependencies: + "extend-shallow" "^2.0.1" + "is-extendable" "^0.1.1" + "is-plain-object" "^2.0.3" + "split-string" "^3.0.1" + +"setprototypeof@1.1.1": + "integrity" "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" + "resolved" "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz" + "version" "1.1.1" + +"shebang-command@^1.2.0": + "integrity" "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=" + "resolved" "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz" + "version" "1.2.0" + dependencies: + "shebang-regex" "^1.0.0" + +"shebang-regex@^1.0.0": + "integrity" "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=" + "resolved" "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz" + "version" "1.0.0" + +"should-equal@^2.0.0": + "integrity" "sha512-ZP36TMrK9euEuWQYBig9W55WPC7uo37qzAEmbjHz4gfyuXrEUgF8cUvQVO+w+d3OMfPvSRQJ22lSm8MQJ43LTA==" + "resolved" "https://registry.npmjs.org/should-equal/-/should-equal-2.0.0.tgz" + "version" "2.0.0" + dependencies: + "should-type" "^1.4.0" + +"should-format@^3.0.3": + "integrity" "sha1-m/yPdPo5IFxT04w01xcwPidxJPE=" + "resolved" "https://registry.npmjs.org/should-format/-/should-format-3.0.3.tgz" + "version" "3.0.3" + dependencies: + "should-type" "^1.3.0" + "should-type-adaptors" "^1.0.1" + +"should-type-adaptors@^1.0.1": + "integrity" "sha512-JA4hdoLnN+kebEp2Vs8eBe9g7uy0zbRo+RMcU0EsNy+R+k049Ki+N5tT5Jagst2g7EAja+euFuoXFCa8vIklfA==" + "resolved" "https://registry.npmjs.org/should-type-adaptors/-/should-type-adaptors-1.1.0.tgz" + "version" "1.1.0" + dependencies: + "should-type" "^1.3.0" + "should-util" "^1.0.0" + +"should-type@^1.3.0", "should-type@^1.4.0": + "integrity" "sha1-B1bYzoRt/QmEOmlHcZ36DUz/XPM=" + "resolved" "https://registry.npmjs.org/should-type/-/should-type-1.4.0.tgz" + "version" "1.4.0" + +"should-util@^1.0.0": + "integrity" "sha512-oXF8tfxx5cDk8r2kYqlkUJzZpDBqVY/II2WhvU0n9Y3XYvAYRmeaf1PvvIvTgPnv4KJ+ES5M0PyDq5Jp+Ygy2g==" + "resolved" "https://registry.npmjs.org/should-util/-/should-util-1.0.1.tgz" + "version" "1.0.1" + +"should@^13.2.3": + "integrity" "sha512-ggLesLtu2xp+ZxI+ysJTmNjh2U0TsC+rQ/pfED9bUZZ4DKefP27D+7YJVVTvKsmjLpIi9jAa7itwDGkDDmt1GQ==" + "resolved" "https://registry.npmjs.org/should/-/should-13.2.3.tgz" + "version" "13.2.3" + dependencies: + "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" + +"showdown@^1.9.1": + "integrity" "sha512-9cGuS382HcvExtf5AHk7Cb4pAeQQ+h0eTr33V1mu+crYWV4KvWAw6el92bDrqGEk5d46Ai/fhbEUwqJ/mTCNEA==" + "resolved" "https://registry.npmjs.org/showdown/-/showdown-1.9.1.tgz" + "version" "1.9.1" + dependencies: + "yargs" "^14.2" + +"side-channel@^1.0.2": + "integrity" "sha512-7rL9YlPHg7Ancea1S96Pa8/QWb4BtXL/TZvS6B8XFetGBeuhAsfmUspK6DokBeZ64+Kj9TCNRD/30pVz1BvQNA==" + "resolved" "https://registry.npmjs.org/side-channel/-/side-channel-1.0.2.tgz" + "version" "1.0.2" + dependencies: + "es-abstract" "^1.17.0-next.1" + "object-inspect" "^1.7.0" + +"signal-exit@^3.0.0": + "integrity" "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==" + "resolved" "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz" + "version" "3.0.3" + +"signal-exit@^3.0.2": + "integrity" "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" + "resolved" "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz" + "version" "3.0.2" + +"simple-swizzle@^0.2.2": + "integrity" "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=" + "resolved" "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz" + "version" "0.2.2" + dependencies: + "is-arrayish" "^0.3.1" + +"snapdragon-node@^2.0.1": + "integrity" "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==" + "resolved" "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz" + "version" "2.1.1" + dependencies: + "define-property" "^1.0.0" + "isobject" "^3.0.0" + "snapdragon-util" "^3.0.1" + +"snapdragon-util@^3.0.1": + "integrity" "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==" + "resolved" "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz" + "version" "3.0.1" + dependencies: + "kind-of" "^3.2.0" + +"snapdragon@^0.8.1": + "integrity" "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==" + "resolved" "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz" + "version" "0.8.2" + dependencies: + "base" "^0.11.1" + "debug" "^2.2.0" + "define-property" "^0.2.5" + "extend-shallow" "^2.0.1" + "map-cache" "^0.2.2" + "source-map" "^0.5.6" + "source-map-resolve" "^0.5.0" + "use" "^3.1.0" + +"snyk-config@^4.0.0-rc.2", "snyk-config@4.0.0": + "integrity" "sha512-E6jNe0oUjjzVASWBOAc/mA23DhbzABDF9MI6UZvl0gylh2NSXSXw2/LjlqMNOKL2c1qkbSkzLOdIX5XACoLCAQ==" + "resolved" "https://registry.npmjs.org/snyk-config/-/snyk-config-4.0.0.tgz" + "version" "4.0.0" + dependencies: + "async" "^3.2.0" + "debug" "^4.1.1" + "lodash.merge" "^4.6.2" + "minimist" "^1.2.5" + +"snyk-cpp-plugin@2.2.1": + "integrity" "sha512-NFwVLMCqKTocY66gcim0ukF6e31VRDJqDapg5sy3vCHqlD1OCNUXSK/aI4VQEEndDrsnFmQepsL5KpEU0dDRIQ==" + "resolved" "https://registry.npmjs.org/snyk-cpp-plugin/-/snyk-cpp-plugin-2.2.1.tgz" + "version" "2.2.1" dependencies: "@snyk/dep-graph" "^1.19.3" - chalk "^4.1.0" - debug "^4.1.1" - hosted-git-info "^3.0.7" - tslib "^2.0.0" + "chalk" "^4.1.0" + "debug" "^4.1.1" + "hosted-git-info" "^3.0.7" + "tslib" "^2.0.0" -snyk-docker-plugin@4.19.3: - version "4.19.3" - resolved "https://registry.yarnpkg.com/snyk-docker-plugin/-/snyk-docker-plugin-4.19.3.tgz#14569f25c52a3fc71a20f80f5beac4ccdc326c11" - integrity sha512-5WkXyT7uY5NrTOvEqxeMqb6dDcskT3c/gbHUTOyPuvE6tMut+OOYK8RRXbwZFeLzpS8asq4e1R7U7syYG3VXwg== +"snyk-docker-plugin@4.19.3": + "integrity" "sha512-5WkXyT7uY5NrTOvEqxeMqb6dDcskT3c/gbHUTOyPuvE6tMut+OOYK8RRXbwZFeLzpS8asq4e1R7U7syYG3VXwg==" + "resolved" "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.19.3.tgz" + "version" "4.19.3" dependencies: "@snyk/dep-graph" "^1.21.0" "@snyk/rpm-parser" "^2.0.0" "@snyk/snyk-docker-pull" "3.2.3" - chalk "^2.4.2" - debug "^4.1.1" - docker-modem "2.1.3" - dockerfile-ast "0.2.0" - elfy "^1.0.0" - event-loop-spinner "^2.0.0" - gunzip-maybe "^1.4.2" - mkdirp "^1.0.4" - semver "^7.3.4" - snyk-nodejs-lockfile-parser "1.30.2" - tar-stream "^2.1.0" - tmp "^0.2.1" - tslib "^1" - uuid "^8.2.0" - -snyk-go-parser@1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/snyk-go-parser/-/snyk-go-parser-1.4.1.tgz#df16a5fbd7a517ee757268ef081abc33506c8857" - integrity sha512-StU3uHB85VMEkcgXta63M0Fgd+9cs5sMCjQXTBoYTdE4dxarPn7U67yCuwkRRdZdny1ZXtzfY8LKns9i0+dy9w== - dependencies: - toml "^3.0.0" - tslib "^1.10.0" - -snyk-go-plugin@1.17.0: - version "1.17.0" - resolved "https://registry.yarnpkg.com/snyk-go-plugin/-/snyk-go-plugin-1.17.0.tgz#56d0c92d7def29ba4c3c2030c5830093e3b0dd26" - integrity sha512-1jAYPRgMapO2BYL+HWsUq5gsAiDGmI0Pn7omc0lk24tcUOMhUB+1hb0u9WBMNzHvXBjevBkjOctjpnt2hMKN6Q== + "chalk" "^2.4.2" + "debug" "^4.1.1" + "docker-modem" "2.1.3" + "dockerfile-ast" "0.2.0" + "elfy" "^1.0.0" + "event-loop-spinner" "^2.0.0" + "gunzip-maybe" "^1.4.2" + "mkdirp" "^1.0.4" + "semver" "^7.3.4" + "snyk-nodejs-lockfile-parser" "1.30.2" + "tar-stream" "^2.1.0" + "tmp" "^0.2.1" + "tslib" "^1" + "uuid" "^8.2.0" + +"snyk-go-parser@1.4.1": + "integrity" "sha512-StU3uHB85VMEkcgXta63M0Fgd+9cs5sMCjQXTBoYTdE4dxarPn7U67yCuwkRRdZdny1ZXtzfY8LKns9i0+dy9w==" + "resolved" "https://registry.npmjs.org/snyk-go-parser/-/snyk-go-parser-1.4.1.tgz" + "version" "1.4.1" + dependencies: + "toml" "^3.0.0" + "tslib" "^1.10.0" + +"snyk-go-plugin@1.17.0": + "integrity" "sha512-1jAYPRgMapO2BYL+HWsUq5gsAiDGmI0Pn7omc0lk24tcUOMhUB+1hb0u9WBMNzHvXBjevBkjOctjpnt2hMKN6Q==" + "resolved" "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.17.0.tgz" + "version" "1.17.0" dependencies: "@snyk/dep-graph" "^1.23.1" "@snyk/graphlib" "2.1.9-patch.3" - debug "^4.1.1" - snyk-go-parser "1.4.1" - tmp "0.2.1" - tslib "^1.10.0" + "debug" "^4.1.1" + "snyk-go-parser" "1.4.1" + "tmp" "0.2.1" + "tslib" "^1.10.0" -snyk-gradle-plugin@3.14.0: - version "3.14.0" - resolved "https://registry.yarnpkg.com/snyk-gradle-plugin/-/snyk-gradle-plugin-3.14.0.tgz#26c9833c97ef50e83b022b2e3077a9056f8674e1" - integrity sha512-2A8ifM91TyzSx/U2fYvHXbaCRVsEx60hGFQjbSH9Hl9AokxEzMi2qti7wsObs1jUX2m198D1mdXu4k/Y1jWxXg== +"snyk-gradle-plugin@3.14.0": + "integrity" "sha512-2A8ifM91TyzSx/U2fYvHXbaCRVsEx60hGFQjbSH9Hl9AokxEzMi2qti7wsObs1jUX2m198D1mdXu4k/Y1jWxXg==" + "resolved" "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.14.0.tgz" + "version" "3.14.0" dependencies: "@snyk/cli-interface" "2.11.0" "@snyk/dep-graph" "^1.28.0" "@snyk/java-call-graph-builder" "1.20.0" "@types/debug" "^4.1.4" - chalk "^3.0.0" - debug "^4.1.1" - tmp "0.2.1" - tslib "^2.0.0" + "chalk" "^3.0.0" + "debug" "^4.1.1" + "tmp" "0.2.1" + "tslib" "^2.0.0" -snyk-module@3.1.0, snyk-module@^3.0.0, snyk-module@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/snyk-module/-/snyk-module-3.1.0.tgz#3e088ff473ddf0d4e253a46ea6749d76d8e6e7ba" - integrity sha512-HHuOYEAACpUpkFgU8HT57mmxmonaJ4O3YADoSkVhnhkmJ+AowqZyJOau703dYHNrq2DvQ7qYw81H7yyxS1Nfjw== +"snyk-module@^3.0.0", "snyk-module@^3.1.0", "snyk-module@3.1.0": + "integrity" "sha512-HHuOYEAACpUpkFgU8HT57mmxmonaJ4O3YADoSkVhnhkmJ+AowqZyJOau703dYHNrq2DvQ7qYw81H7yyxS1Nfjw==" + "resolved" "https://registry.npmjs.org/snyk-module/-/snyk-module-3.1.0.tgz" + "version" "3.1.0" dependencies: - debug "^4.1.1" - hosted-git-info "^3.0.4" + "debug" "^4.1.1" + "hosted-git-info" "^3.0.4" -snyk-mvn-plugin@2.25.3: - version "2.25.3" - resolved "https://registry.yarnpkg.com/snyk-mvn-plugin/-/snyk-mvn-plugin-2.25.3.tgz#fb7f6fa1d565b9f07c032e8b34e6308c310b2a27" - integrity sha512-JAxOThX51JDbgMMjp3gQDVi07G9VgTYSF06QC7f5LNA0zoXNr743e2rm78RGw5bqE3JRjZxEghiLHPPuvS5DDg== +"snyk-mvn-plugin@2.25.3": + "integrity" "sha512-JAxOThX51JDbgMMjp3gQDVi07G9VgTYSF06QC7f5LNA0zoXNr743e2rm78RGw5bqE3JRjZxEghiLHPPuvS5DDg==" + "resolved" "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.25.3.tgz" + "version" "2.25.3" dependencies: "@snyk/cli-interface" "2.11.0" "@snyk/dep-graph" "^1.23.1" "@snyk/java-call-graph-builder" "1.19.1" - debug "^4.1.1" - glob "^7.1.6" - needle "^2.5.0" - tmp "^0.1.0" - tslib "1.11.1" + "debug" "^4.1.1" + "glob" "^7.1.6" + "needle" "^2.5.0" + "tmp" "^0.1.0" + "tslib" "1.11.1" -snyk-nodejs-lockfile-parser@1.30.2: - version "1.30.2" - resolved "https://registry.yarnpkg.com/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.30.2.tgz#8dbb64c42382aeaf4488c36e48c1e48eb75a1584" - integrity sha512-wI3VXVYO/ok0uaQm5i+Koo4rKBNilYC/QRIQFlyGbZXf+WBdRcTBKVDfTy8uNfUhMRSGzd84lNclMnetU9Y+vw== +"snyk-nodejs-lockfile-parser@1.30.2": + "integrity" "sha512-wI3VXVYO/ok0uaQm5i+Koo4rKBNilYC/QRIQFlyGbZXf+WBdRcTBKVDfTy8uNfUhMRSGzd84lNclMnetU9Y+vw==" + "resolved" "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.30.2.tgz" + "version" "1.30.2" dependencies: "@snyk/graphlib" "2.1.9-patch.3" "@yarnpkg/lockfile" "^1.1.0" - event-loop-spinner "^2.0.0" - got "11.4.0" - lodash.clonedeep "^4.5.0" - lodash.flatmap "^4.5.0" - lodash.isempty "^4.4.0" - lodash.set "^4.3.2" - lodash.topairs "^4.3.0" - p-map "2.1.0" - snyk-config "^4.0.0-rc.2" - tslib "^1.9.3" - uuid "^8.3.0" - yaml "^1.9.2" - -snyk-nodejs-lockfile-parser@1.31.1: - version "1.31.1" - resolved "https://registry.yarnpkg.com/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.31.1.tgz#badd9fbf8f58f0bd090e5378997cbe4548033664" - integrity sha512-MU1V2zS5ziLGMUL6PXxPvJuZ281wvawjQQ1c8TW697Jjkhd8hPZcW4IzMu52ok0zsmQcVZh8sVniBEHIePCfLQ== + "event-loop-spinner" "^2.0.0" + "got" "11.4.0" + "lodash.clonedeep" "^4.5.0" + "lodash.flatmap" "^4.5.0" + "lodash.isempty" "^4.4.0" + "lodash.set" "^4.3.2" + "lodash.topairs" "^4.3.0" + "p-map" "2.1.0" + "snyk-config" "^4.0.0-rc.2" + "tslib" "^1.9.3" + "uuid" "^8.3.0" + "yaml" "^1.9.2" + +"snyk-nodejs-lockfile-parser@1.31.1": + "integrity" "sha512-MU1V2zS5ziLGMUL6PXxPvJuZ281wvawjQQ1c8TW697Jjkhd8hPZcW4IzMu52ok0zsmQcVZh8sVniBEHIePCfLQ==" + "resolved" "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.31.1.tgz" + "version" "1.31.1" dependencies: "@snyk/graphlib" "2.1.9-patch.3" "@yarnpkg/lockfile" "^1.1.0" - event-loop-spinner "^2.0.0" - got "11.4.0" - lodash.clonedeep "^4.5.0" - lodash.flatmap "^4.5.0" - lodash.isempty "^4.4.0" - lodash.set "^4.3.2" - lodash.topairs "^4.3.0" - p-map "2.1.0" - snyk-config "^4.0.0-rc.2" - tslib "^1.9.3" - uuid "^8.3.0" - yaml "^1.9.2" - -snyk-nuget-plugin@1.21.0: - version "1.21.0" - resolved "https://registry.yarnpkg.com/snyk-nuget-plugin/-/snyk-nuget-plugin-1.21.0.tgz#d9d3976cf0b4572ae97c47f758f84fc43040216f" - integrity sha512-c/JYF3sZzMN/lYz171zrEkVcPqDVcUTVgKIKHiL8nhhuFKxZQ1gzqOgk+lnfN31TLoTNQsZ3DhW/WY+4zEALvw== - dependencies: - debug "^4.1.1" - dotnet-deps-parser "5.0.0" - jszip "3.4.0" - snyk-paket-parser "1.6.0" - tslib "^1.11.2" - xml2js "^0.4.17" - -snyk-paket-parser@1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/snyk-paket-parser/-/snyk-paket-parser-1.6.0.tgz#f70c423b33d31484c8c4cae74bb7f5deb9bbc382" - integrity sha512-6htFynjBe/nakclEHUZ1A3j5Eu32/0pNve5Qm4MFn3YQmJgj7UcAO8hdyK3QfzEY29/kAv/rkJQg+SKshn+N9Q== - dependencies: - tslib "^1.9.3" - -snyk-php-plugin@1.9.2: - version "1.9.2" - resolved "https://registry.yarnpkg.com/snyk-php-plugin/-/snyk-php-plugin-1.9.2.tgz#282ef733060aab49da23e1fb2d2dd1af8f71f7cd" - integrity sha512-IQcdsQBqqXVRY5DatlI7ASy4flbhtU2V7cr4P2rK9rkFnVHO6LHcitwKXVZa9ocdOmpZDzk7U6iwHJkVFcR6OA== + "event-loop-spinner" "^2.0.0" + "got" "11.4.0" + "lodash.clonedeep" "^4.5.0" + "lodash.flatmap" "^4.5.0" + "lodash.isempty" "^4.4.0" + "lodash.set" "^4.3.2" + "lodash.topairs" "^4.3.0" + "p-map" "2.1.0" + "snyk-config" "^4.0.0-rc.2" + "tslib" "^1.9.3" + "uuid" "^8.3.0" + "yaml" "^1.9.2" + +"snyk-nuget-plugin@1.21.0": + "integrity" "sha512-c/JYF3sZzMN/lYz171zrEkVcPqDVcUTVgKIKHiL8nhhuFKxZQ1gzqOgk+lnfN31TLoTNQsZ3DhW/WY+4zEALvw==" + "resolved" "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.21.0.tgz" + "version" "1.21.0" + dependencies: + "debug" "^4.1.1" + "dotnet-deps-parser" "5.0.0" + "jszip" "3.4.0" + "snyk-paket-parser" "1.6.0" + "tslib" "^1.11.2" + "xml2js" "^0.4.17" + +"snyk-paket-parser@1.6.0": + "integrity" "sha512-6htFynjBe/nakclEHUZ1A3j5Eu32/0pNve5Qm4MFn3YQmJgj7UcAO8hdyK3QfzEY29/kAv/rkJQg+SKshn+N9Q==" + "resolved" "https://registry.npmjs.org/snyk-paket-parser/-/snyk-paket-parser-1.6.0.tgz" + "version" "1.6.0" + dependencies: + "tslib" "^1.9.3" + +"snyk-php-plugin@1.9.2": + "integrity" "sha512-IQcdsQBqqXVRY5DatlI7ASy4flbhtU2V7cr4P2rK9rkFnVHO6LHcitwKXVZa9ocdOmpZDzk7U6iwHJkVFcR6OA==" + "resolved" "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.9.2.tgz" + "version" "1.9.2" dependencies: "@snyk/cli-interface" "^2.9.1" "@snyk/composer-lockfile-parser" "^1.4.1" - tslib "1.11.1" + "tslib" "1.11.1" -snyk-poetry-lockfile-parser@^1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/snyk-poetry-lockfile-parser/-/snyk-poetry-lockfile-parser-1.1.6.tgz#bab5a279c103cbcca8eb86ab87717b115592881e" - integrity sha512-MoekbWOZPj9umfukjk2bd2o3eRj0OyO+58sxq9crMtHmTlze4h0/Uj4+fb0JFPBOtBO3c2zwbA+dvFQmpKoOTA== +"snyk-poetry-lockfile-parser@^1.1.6": + "integrity" "sha512-MoekbWOZPj9umfukjk2bd2o3eRj0OyO+58sxq9crMtHmTlze4h0/Uj4+fb0JFPBOtBO3c2zwbA+dvFQmpKoOTA==" + "resolved" "https://registry.npmjs.org/snyk-poetry-lockfile-parser/-/snyk-poetry-lockfile-parser-1.1.6.tgz" + "version" "1.1.6" dependencies: "@snyk/cli-interface" "^2.9.2" "@snyk/dep-graph" "^1.23.0" - debug "^4.2.0" - toml "^3.0.0" - tslib "^2.0.0" - -snyk-policy@1.19.0: - version "1.19.0" - resolved "https://registry.yarnpkg.com/snyk-policy/-/snyk-policy-1.19.0.tgz#0cbc442d9503970fb3afea938f57d57993a914ad" - integrity sha512-XYjhOTRPFA7NfDUsH6uH1fbML2OgSFsqdUPbud7x01urNP9CHXgUgAD4NhKMi3dVQK+7IdYadWt0wrFWw4y+qg== - dependencies: - debug "^4.1.1" - email-validator "^2.0.4" - js-yaml "^3.13.1" - lodash.clonedeep "^4.5.0" - promise-fs "^2.1.1" - semver "^6.0.0" - snyk-module "^3.0.0" - snyk-resolve "^1.1.0" - snyk-try-require "^2.0.0" - -snyk-python-plugin@1.19.7: - version "1.19.7" - resolved "https://registry.yarnpkg.com/snyk-python-plugin/-/snyk-python-plugin-1.19.7.tgz#d7e536694a481fd48e7d0cc8e7753c3f15a9c8be" - integrity sha512-twAGoIgJVSLVzMkuT/n5l9ZDvhMbWH7De6flWiHQB/grthfl3vJDzLCxiTa+6H/IEEYNSv6F/nSrfNh9UbW5/A== + "debug" "^4.2.0" + "toml" "^3.0.0" + "tslib" "^2.0.0" + +"snyk-policy@1.19.0": + "integrity" "sha512-XYjhOTRPFA7NfDUsH6uH1fbML2OgSFsqdUPbud7x01urNP9CHXgUgAD4NhKMi3dVQK+7IdYadWt0wrFWw4y+qg==" + "resolved" "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.19.0.tgz" + "version" "1.19.0" + dependencies: + "debug" "^4.1.1" + "email-validator" "^2.0.4" + "js-yaml" "^3.13.1" + "lodash.clonedeep" "^4.5.0" + "promise-fs" "^2.1.1" + "semver" "^6.0.0" + "snyk-module" "^3.0.0" + "snyk-resolve" "^1.1.0" + "snyk-try-require" "^2.0.0" + +"snyk-python-plugin@1.19.7": + "integrity" "sha512-twAGoIgJVSLVzMkuT/n5l9ZDvhMbWH7De6flWiHQB/grthfl3vJDzLCxiTa+6H/IEEYNSv6F/nSrfNh9UbW5/A==" + "resolved" "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.19.7.tgz" + "version" "1.19.7" dependencies: "@snyk/cli-interface" "^2.0.3" - snyk-poetry-lockfile-parser "^1.1.6" - tmp "0.0.33" - -snyk-resolve-deps@4.7.2: - version "4.7.2" - resolved "https://registry.yarnpkg.com/snyk-resolve-deps/-/snyk-resolve-deps-4.7.2.tgz#11e7051110dadd8756819594bb30e6b88777a8b4" - integrity sha512-Bmtr7QdRL2b3Js+mPDmvXbkprOpzO8aUFXqR0nJKAOlUVQqZ84yiuT0n/mssEiJJ0vP+k0kZvTeiTwgio4KZRg== - dependencies: - ansicolors "^0.3.2" - debug "^4.1.1" - lodash.assign "^4.2.0" - lodash.assignin "^4.2.0" - lodash.clone "^4.5.0" - lodash.flatten "^4.4.0" - lodash.get "^4.4.2" - lodash.set "^4.3.2" - lru-cache "^4.0.0" - semver "^5.5.1" - snyk-module "^3.1.0" - snyk-resolve "^1.0.0" - snyk-tree "^1.0.0" - snyk-try-require "^1.1.1" - then-fs "^2.0.0" - -snyk-resolve@1.1.0, snyk-resolve@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/snyk-resolve/-/snyk-resolve-1.1.0.tgz#52740cb01ba477851086855f9857b3a44296ee0e" - integrity sha512-OZMF8I8TOu0S58Z/OS9mr8jkEzGAPByCsAkrWlcmZgPaE0RsxVKVIFPhbMNy/JlYswgGDYYIEsNw+e0j1FnTrw== - dependencies: - debug "^4.1.1" - promise-fs "^2.1.1" - -snyk-resolve@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/snyk-resolve/-/snyk-resolve-1.0.1.tgz#eaa4a275cf7e2b579f18da5b188fe601b8eed9ab" - integrity sha512-7+i+LLhtBo1Pkth01xv+RYJU8a67zmJ8WFFPvSxyCjdlKIcsps4hPQFebhz+0gC5rMemlaeIV6cqwqUf9PEDpw== - dependencies: - debug "^3.1.0" - then-fs "^2.0.0" - -snyk-sbt-plugin@2.11.0: - version "2.11.0" - resolved "https://registry.yarnpkg.com/snyk-sbt-plugin/-/snyk-sbt-plugin-2.11.0.tgz#f5469dcf5589e34575fc901e2064475582cc3e48" - integrity sha512-wUqHLAa3MzV6sVO+05MnV+lwc+T6o87FZZaY+43tQPytBI2Wq23O3j4POREM4fa2iFfiQJoEYD6c7xmhiEUsSA== - dependencies: - debug "^4.1.1" - semver "^6.1.2" - tmp "^0.1.0" - tree-kill "^1.2.2" - tslib "^1.10.0" - -snyk-tree@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/snyk-tree/-/snyk-tree-1.0.0.tgz#0fb73176dbf32e782f19100294160448f9111cc8" - integrity sha1-D7cxdtvzLngvGRAClBYESPkRHMg= - dependencies: - archy "^1.0.0" - -snyk-try-require@1.3.1, snyk-try-require@^1.1.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/snyk-try-require/-/snyk-try-require-1.3.1.tgz#6e026f92e64af7fcccea1ee53d524841e418a212" - integrity sha1-bgJvkuZK9/zM6h7lPVJIQeQYohI= - dependencies: - debug "^3.1.0" - lodash.clonedeep "^4.3.0" - lru-cache "^4.0.0" - then-fs "^2.0.0" - -snyk-try-require@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/snyk-try-require/-/snyk-try-require-2.0.1.tgz#076ae9bc505d64d28389452ce19fcac28f26655a" - integrity sha512-VCOfFIvqLMXgCXEdooQgu3A40XYIFBnj0X8Y01RJ5iAbu08b4WKGN/uAKaRVF30dABS4EcjsalmCO+YlKUPEIA== - dependencies: - debug "^4.1.1" - lodash.clonedeep "^4.3.0" - lru-cache "^5.1.1" - -snyk@^1.518.0: - version "1.520.0" - resolved "https://registry.yarnpkg.com/snyk/-/snyk-1.520.0.tgz#2cc0a9981a47f1140379c48e9a1116c68328ccd2" - integrity sha512-+NSZDb1sbG+AxzK//GLAKHF0oyPyDlUzQgwy8tyet4tiUsnDKKEruCsX4R9c0outy5qfAExKG77aZego3N9p/Q== + "snyk-poetry-lockfile-parser" "^1.1.6" + "tmp" "0.0.33" + +"snyk-resolve-deps@4.7.2": + "integrity" "sha512-Bmtr7QdRL2b3Js+mPDmvXbkprOpzO8aUFXqR0nJKAOlUVQqZ84yiuT0n/mssEiJJ0vP+k0kZvTeiTwgio4KZRg==" + "resolved" "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-4.7.2.tgz" + "version" "4.7.2" + dependencies: + "ansicolors" "^0.3.2" + "debug" "^4.1.1" + "lodash.assign" "^4.2.0" + "lodash.assignin" "^4.2.0" + "lodash.clone" "^4.5.0" + "lodash.flatten" "^4.4.0" + "lodash.get" "^4.4.2" + "lodash.set" "^4.3.2" + "lru-cache" "^4.0.0" + "semver" "^5.5.1" + "snyk-module" "^3.1.0" + "snyk-resolve" "^1.0.0" + "snyk-tree" "^1.0.0" + "snyk-try-require" "^1.1.1" + "then-fs" "^2.0.0" + +"snyk-resolve@^1.0.0": + "integrity" "sha512-7+i+LLhtBo1Pkth01xv+RYJU8a67zmJ8WFFPvSxyCjdlKIcsps4hPQFebhz+0gC5rMemlaeIV6cqwqUf9PEDpw==" + "resolved" "https://registry.npmjs.org/snyk-resolve/-/snyk-resolve-1.0.1.tgz" + "version" "1.0.1" + dependencies: + "debug" "^3.1.0" + "then-fs" "^2.0.0" + +"snyk-resolve@^1.1.0", "snyk-resolve@1.1.0": + "integrity" "sha512-OZMF8I8TOu0S58Z/OS9mr8jkEzGAPByCsAkrWlcmZgPaE0RsxVKVIFPhbMNy/JlYswgGDYYIEsNw+e0j1FnTrw==" + "resolved" "https://registry.npmjs.org/snyk-resolve/-/snyk-resolve-1.1.0.tgz" + "version" "1.1.0" + dependencies: + "debug" "^4.1.1" + "promise-fs" "^2.1.1" + +"snyk-sbt-plugin@2.11.0": + "integrity" "sha512-wUqHLAa3MzV6sVO+05MnV+lwc+T6o87FZZaY+43tQPytBI2Wq23O3j4POREM4fa2iFfiQJoEYD6c7xmhiEUsSA==" + "resolved" "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-2.11.0.tgz" + "version" "2.11.0" + dependencies: + "debug" "^4.1.1" + "semver" "^6.1.2" + "tmp" "^0.1.0" + "tree-kill" "^1.2.2" + "tslib" "^1.10.0" + +"snyk-tree@^1.0.0": + "integrity" "sha1-D7cxdtvzLngvGRAClBYESPkRHMg=" + "resolved" "https://registry.npmjs.org/snyk-tree/-/snyk-tree-1.0.0.tgz" + "version" "1.0.0" + dependencies: + "archy" "^1.0.0" + +"snyk-try-require@^1.1.1", "snyk-try-require@1.3.1": + "integrity" "sha1-bgJvkuZK9/zM6h7lPVJIQeQYohI=" + "resolved" "https://registry.npmjs.org/snyk-try-require/-/snyk-try-require-1.3.1.tgz" + "version" "1.3.1" + dependencies: + "debug" "^3.1.0" + "lodash.clonedeep" "^4.3.0" + "lru-cache" "^4.0.0" + "then-fs" "^2.0.0" + +"snyk-try-require@^2.0.0": + "integrity" "sha512-VCOfFIvqLMXgCXEdooQgu3A40XYIFBnj0X8Y01RJ5iAbu08b4WKGN/uAKaRVF30dABS4EcjsalmCO+YlKUPEIA==" + "resolved" "https://registry.npmjs.org/snyk-try-require/-/snyk-try-require-2.0.1.tgz" + "version" "2.0.1" + dependencies: + "debug" "^4.1.1" + "lodash.clonedeep" "^4.3.0" + "lru-cache" "^5.1.1" + +"snyk@^1.518.0": + "integrity" "sha512-+NSZDb1sbG+AxzK//GLAKHF0oyPyDlUzQgwy8tyet4tiUsnDKKEruCsX4R9c0outy5qfAExKG77aZego3N9p/Q==" + "resolved" "https://registry.npmjs.org/snyk/-/snyk-1.520.0.tgz" + "version" "1.520.0" dependencies: "@open-policy-agent/opa-wasm" "^1.2.0" "@snyk/cli-interface" "2.11.0" @@ -7189,1395 +7454,1457 @@ snyk@^1.518.0: "@snyk/inquirer" "^7.3.3-patch" "@snyk/snyk-cocoapods-plugin" "2.5.2" "@snyk/snyk-hex-plugin" "1.0.0" - abbrev "^1.1.1" - ansi-escapes "3.2.0" - chalk "^2.4.2" - cli-spinner "0.2.10" - configstore "^5.0.1" - debug "^4.1.1" - diff "^4.0.1" - global-agent "^2.1.12" - hcl-to-json "^0.1.1" - lodash.assign "^4.2.0" - lodash.camelcase "^4.3.0" - lodash.clonedeep "^4.5.0" - lodash.endswith "^4.2.1" - lodash.flatten "^4.4.0" - lodash.flattendeep "^4.4.0" - lodash.get "^4.4.2" - lodash.groupby "^4.6.0" - lodash.isempty "^4.4.0" - lodash.isobject "^3.0.2" - lodash.map "^4.6.0" - lodash.omit "^4.5.0" - lodash.orderby "^4.6.0" - lodash.sortby "^4.7.0" - lodash.uniq "^4.5.0" - lodash.upperfirst "^4.3.1" - lodash.values "^4.3.0" - micromatch "4.0.2" - needle "2.6.0" - open "^7.0.3" - ora "5.3.0" - os-name "^3.0.0" - promise-queue "^2.2.5" - proxy-from-env "^1.0.0" - rimraf "^2.6.3" - semver "^6.0.0" - snyk-config "4.0.0" - snyk-cpp-plugin "2.2.1" - snyk-docker-plugin "4.19.3" - snyk-go-plugin "1.17.0" - snyk-gradle-plugin "3.14.0" - snyk-module "3.1.0" - snyk-mvn-plugin "2.25.3" - snyk-nodejs-lockfile-parser "1.31.1" - snyk-nuget-plugin "1.21.0" - snyk-php-plugin "1.9.2" - snyk-policy "1.19.0" - snyk-python-plugin "1.19.7" - snyk-resolve "1.1.0" - snyk-resolve-deps "4.7.2" - snyk-sbt-plugin "2.11.0" - snyk-tree "^1.0.0" - snyk-try-require "1.3.1" - source-map-support "^0.5.11" - strip-ansi "^5.2.0" - tar "^6.1.0" - tempfile "^2.0.0" - update-notifier "^4.1.0" - uuid "^3.3.2" - wrap-ansi "^5.1.0" - -socket.io-adapter@~1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz#2a805e8a14d6372124dd9159ad4502f8cb07f06b" - integrity sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs= - -socket.io-client@2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.4.0.tgz#aafb5d594a3c55a34355562fc8aea22ed9119a35" - integrity sha512-M6xhnKQHuuZd4Ba9vltCLT9oa+YvTsP8j9NcEiLElfIg8KeYPyhWOes6x4t+LTAC8enQbE/995AdTem2uNyKKQ== - dependencies: - backo2 "1.0.2" - component-bind "1.0.0" - component-emitter "~1.3.0" - debug "~3.1.0" - engine.io-client "~3.5.0" - has-binary2 "~1.0.2" - indexof "0.0.1" - parseqs "0.0.6" - parseuri "0.0.6" - socket.io-parser "~3.3.0" - to-array "0.1.4" - -socket.io-parser@~3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.0.tgz#2b52a96a509fdf31440ba40fed6094c7d4f1262f" - integrity sha512-hczmV6bDgdaEbVqhAeVMM/jfUfzuEZHsQg6eOmLgJht6G3mPKMxYm75w2+qhAQZ+4X+1+ATZ+QFKeOZD5riHng== - dependencies: - component-emitter "1.2.1" - debug "~3.1.0" - isarray "2.0.1" - -socket.io-parser@~3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.4.0.tgz#370bb4a151df2f77ce3345ff55a7072cc6e9565a" - integrity sha512-/G/VOI+3DBp0+DJKW4KesGnQkQPFmUCbA/oO2QGT6CWxU7hLGWqU3tyuzeSK/dqcyeHsQg1vTe9jiZI8GU9SCQ== - dependencies: - component-emitter "1.2.1" - debug "~4.1.0" - isarray "2.0.1" - -socket.io@^2.4.0: - version "2.4.1" - resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.4.1.tgz#95ad861c9a52369d7f1a68acf0d4a1b16da451d2" - integrity sha512-Si18v0mMXGAqLqCVpTxBa8MGqriHGQh8ccEOhmsmNS3thNCGBwO8WGrwMibANsWtQQ5NStdZwHqZR3naJVFc3w== - dependencies: - debug "~4.1.0" - engine.io "~3.5.0" - has-binary2 "~1.0.2" - socket.io-adapter "~1.1.0" - socket.io-client "2.4.0" - socket.io-parser "~3.4.0" - -sortablejs@^1.7.0: - version "1.8.3" - resolved "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.8.3.tgz#5ae908ef96300966e95440a143340f5dd565a0df" - integrity sha512-AftvD4hdKcR5QlGi7L/JST506zGNGrysE8/QohDpwKXJarHWqCt+TUlrtoMk/wkECB607Q019/OZlJViyWiD6A== - -source-map-resolve@^0.5.0: - version "0.5.2" - resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259" - integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA== - dependencies: - atob "^2.1.1" - decode-uri-component "^0.2.0" - resolve-url "^0.2.1" - source-map-url "^0.4.0" - urix "^0.1.0" - -source-map-support@^0.5.11, source-map-support@^0.5.7, source-map-support@~0.5.10: - version "0.5.16" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042" - integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ== - dependencies: - buffer-from "^1.0.0" - source-map "^0.6.0" - -source-map-support@^0.5.19: - version "0.5.19" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" - integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== - dependencies: - buffer-from "^1.0.0" - source-map "^0.6.0" - -source-map-url@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" - integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM= - -source-map@0.6.*, source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" - integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== - -source-map@^0.4.2: - version "0.4.4" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b" - integrity sha1-66T12pwNyZneaAMti092FzZSA2s= - dependencies: - amdefine ">=0.0.4" - -source-map@^0.5.3, source-map@^0.5.6: - version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= - -sourcemap-codec@^1.4.4: - version "1.4.4" - resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.4.tgz#c63ea927c029dd6bd9a2b7fa03b3fec02ad56e9f" - integrity sha512-CYAPYdBu34781kLHkaW3m6b/uUSyMOC2R61gcYMWooeuaGtjof86ZA/8T+qVPPt7np1085CR9hmMGrySwEc8Xg== - -spdx-correct@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9" - integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w== - dependencies: - spdx-expression-parse "^3.0.0" - spdx-license-ids "^3.0.0" - -spdx-exceptions@^2.1.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d" - integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A== - -spdx-expression-parse@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679" - integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q== - dependencies: - spdx-exceptions "^2.1.0" - spdx-license-ids "^3.0.0" - -spdx-license-ids@^3.0.0: - version "3.0.6" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz#c80757383c28abf7296744998cbc106ae8b854ce" - integrity sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw== - -split-ca@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/split-ca/-/split-ca-1.0.1.tgz#6c83aff3692fa61256e0cd197e05e9de157691a6" - integrity sha1-bIOv82kvphJW4M0ZfgXp3hV2kaY= - -split-string@^3.0.1, split-string@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" - integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw== - dependencies: - extend-shallow "^3.0.0" - -sprintf-js@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673" - integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug== - -sprintf-js@~1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" - integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= - -ssh2-streams@~0.4.10: - version "0.4.10" - resolved "https://registry.yarnpkg.com/ssh2-streams/-/ssh2-streams-0.4.10.tgz#48ef7e8a0e39d8f2921c30521d56dacb31d23a34" - integrity sha512-8pnlMjvnIZJvmTzUIIA5nT4jr2ZWNNVHwyXfMGdRJbug9TpI3kd99ffglgfSWqujVv/0gxwMsDn9j9RVst8yhQ== - dependencies: - asn1 "~0.2.0" - bcrypt-pbkdf "^1.0.2" - streamsearch "~0.1.2" - -ssh2@^0.8.7: - version "0.8.9" - resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-0.8.9.tgz#54da3a6c4ba3daf0d8477a538a481326091815f3" - integrity sha512-GmoNPxWDMkVpMFa9LVVzQZHF6EW3WKmBwL+4/GeILf2hFmix5Isxm7Amamo8o7bHiU0tC+wXsGcUXOxp8ChPaw== - dependencies: - ssh2-streams "~0.4.10" - -sshpk@^1.7.0: - version "1.16.1" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877" - integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg== - dependencies: - asn1 "~0.2.3" - assert-plus "^1.0.0" - bcrypt-pbkdf "^1.0.0" - dashdash "^1.12.0" - ecc-jsbn "~0.1.1" - getpass "^0.1.1" - jsbn "~0.1.0" - safer-buffer "^2.0.2" - tweetnacl "~0.14.0" - -stable@^0.1.8: - version "0.1.8" - resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" - integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w== - -stack-trace@0.0.x: - version "0.0.10" - resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" - integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA= - -static-extend@^0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" - integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY= - dependencies: - define-property "^0.2.5" - object-copy "^0.1.0" - -"statuses@>= 1.5.0 < 2", statuses@~1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" - integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= - -stdout-stream@^1.4.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.1.tgz#5ac174cdd5cd726104aa0c0b2bd83815d8d535de" - integrity sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA== - dependencies: - readable-stream "^2.0.1" - -stream-shift@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d" - integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ== - -streamsearch@~0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-0.1.2.tgz#808b9d0e56fc273d809ba57338e929919a1a9f1a" - integrity sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo= - -string-hash@^1.1.0, string-hash@^1.1.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/string-hash/-/string-hash-1.1.3.tgz#e8aafc0ac1855b4666929ed7dd1275df5d6c811b" - integrity sha1-6Kr8CsGFW0Zmkp7X3RJ1311sgRs= - -string-width@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" - integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= - dependencies: - code-point-at "^1.0.0" - is-fullwidth-code-point "^1.0.0" - strip-ansi "^3.0.0" - -"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" - integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== - dependencies: - is-fullwidth-code-point "^2.0.0" - strip-ansi "^4.0.0" - -string-width@^3.0.0, string-width@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" - integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== - dependencies: - emoji-regex "^7.0.1" - is-fullwidth-code-point "^2.0.0" - strip-ansi "^5.1.0" - -string-width@^4.0.0, string-width@^4.1.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5" - integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.0" - -string.prototype.trimend@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913" - integrity sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g== - dependencies: - define-properties "^1.1.3" - es-abstract "^1.17.5" - -string.prototype.trimleft@^2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz#4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc" - integrity sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw== - dependencies: - define-properties "^1.1.3" - es-abstract "^1.17.5" - string.prototype.trimstart "^1.0.0" - -string.prototype.trimright@^2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz#c76f1cef30f21bbad8afeb8db1511496cfb0f2a3" - integrity sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg== - dependencies: - define-properties "^1.1.3" - es-abstract "^1.17.5" - string.prototype.trimend "^1.0.0" - -string.prototype.trimstart@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz#14af6d9f34b053f7cfc89b72f8f2ee14b9039a54" - integrity sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw== - dependencies: - define-properties "^1.1.3" - es-abstract "^1.17.5" - -string_decoder@^1.1.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" - integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== - dependencies: - safe-buffer "~5.2.0" - -string_decoder@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" - integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== - dependencies: - safe-buffer "~5.1.0" - -strip-ansi@6.0.0, strip-ansi@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" - integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== - dependencies: - ansi-regex "^5.0.0" - -strip-ansi@^3.0.0, strip-ansi@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= - dependencies: - ansi-regex "^2.0.0" - -strip-ansi@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" - integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= - dependencies: - ansi-regex "^3.0.0" - -strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" - integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== - dependencies: - ansi-regex "^4.1.0" - -strip-bom@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e" - integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4= - dependencies: - is-utf8 "^0.2.0" - -strip-eof@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" - integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= - -strip-indent@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2" - integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI= - dependencies: - get-stdin "^4.0.1" - -strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= - -style-inject@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/style-inject/-/style-inject-0.3.0.tgz#d21c477affec91811cc82355832a700d22bf8dd3" - integrity sha512-IezA2qp+vcdlhJaVm5SOdPPTUu0FCEqfNSli2vRuSIBbu5Nq5UvygTk/VzeCqfLz2Atj3dVII5QBKGZRZ0edzw== - -stylehacks@^4.0.0: - version "4.0.3" - resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-4.0.3.tgz#6718fcaf4d1e07d8a1318690881e8d96726a71d5" - integrity sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g== - dependencies: - browserslist "^4.0.0" - postcss "^7.0.0" - postcss-selector-parser "^3.0.0" - -superagent@^3.8.2: - version "3.8.3" - resolved "https://registry.yarnpkg.com/superagent/-/superagent-3.8.3.tgz#460ea0dbdb7d5b11bc4f78deba565f86a178e128" - integrity sha512-GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA== - dependencies: - component-emitter "^1.2.0" - cookiejar "^2.1.0" - debug "^3.1.0" - extend "^3.0.0" - form-data "^2.3.1" - formidable "^1.2.0" - methods "^1.1.1" - mime "^1.4.1" - qs "^6.5.1" - readable-stream "^2.3.5" - -supports-color@5.4.0: - version "5.4.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54" - integrity sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w== - dependencies: - has-flag "^3.0.0" - -supports-color@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" - integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= - -supports-color@^3.2.3: - version "3.2.3" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6" - integrity sha1-ZawFBLOVQXHYpklGsq48u4pfVPY= - dependencies: - has-flag "^1.0.0" - -supports-color@^5.3.0, supports-color@^5.4.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" - integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== - dependencies: - has-flag "^3.0.0" - -supports-color@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3" - integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ== - dependencies: - has-flag "^3.0.0" - -supports-color@^7.1.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1" - integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g== - dependencies: - has-flag "^4.0.0" - -svg-sprite@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/svg-sprite/-/svg-sprite-1.5.0.tgz#d0c0dd2f9aa1bc12ca649d7a8f301370b26e42ce" - integrity sha512-0mE5BLY3K8wg3+HrYfzpiKbIM44IGcg8uINED8ri22EdQbLvGecOHjRtkrNAlphbiU5kyGyqoBlIaukL45fs2Q== - dependencies: - 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" - -svgo@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.2.0.tgz#305a8fc0f4f9710828c65039bb93d5793225ffc3" - integrity sha512-xBfxJxfk4UeVN8asec9jNxHiv3UAMv/ujwBWGYvQhhMb2u3YTGKkiybPcLFDLq7GLLWE9wa73e0/m8L5nTzQbw== - dependencies: - chalk "^2.4.1" - coa "^2.0.2" - css-select "^2.0.0" - css-select-base-adapter "^0.1.1" - css-tree "1.0.0-alpha.28" - css-url-regex "^1.1.0" - csso "^3.5.1" - js-yaml "^3.12.0" - mkdirp "~0.5.1" - object.values "^1.1.0" - sax "~1.2.4" - stable "^0.1.8" - unquote "~1.1.1" - util.promisify "~1.0.0" - -svgo@^1.1.1: - version "1.3.2" - resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz#b6dc511c063346c9e415b81e43401145b96d4167" - integrity sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw== - dependencies: - chalk "^2.4.1" - coa "^2.0.2" - css-select "^2.0.0" - css-select-base-adapter "^0.1.1" - css-tree "1.0.0-alpha.37" - csso "^4.0.2" - js-yaml "^3.13.1" - mkdirp "~0.5.1" - object.values "^1.1.0" - sax "~1.2.4" - stable "^0.1.8" - unquote "~1.1.1" - util.promisify "~1.0.0" - -tar-stream@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.0.tgz#d1aaa3661f05b38b5acc9b7020efdca5179a2cc3" - integrity sha512-+DAn4Nb4+gz6WZigRzKEZl1QuJVOLtAwwF+WUxy1fJ6X63CaGaUAxJRD2KEn1OMfcbCjySTYpNC6WmfQoIEOdw== - dependencies: - bl "^3.0.0" - end-of-stream "^1.4.1" - fs-constants "^1.0.0" - inherits "^2.0.3" - readable-stream "^3.1.1" - -tar-stream@^2.1.2: - version "2.1.3" - resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.3.tgz#1e2022559221b7866161660f118255e20fa79e41" - integrity sha512-Z9yri56Dih8IaK8gncVPx4Wqt86NDmQTSh49XLZgjWpGZL9GK9HKParS2scqHCC4w6X9Gh2jwaU45V47XTKwVA== - dependencies: - bl "^4.0.1" - end-of-stream "^1.4.1" - fs-constants "^1.0.0" - inherits "^2.0.3" - readable-stream "^3.1.1" - -tar@^2.0.0: - version "2.2.2" - resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40" - integrity sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA== - dependencies: - block-stream "*" - fstream "^1.0.12" - inherits "2" - -tar@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.0.tgz#d1724e9bcc04b977b18d5c573b333a2207229a83" - integrity sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA== - dependencies: - chownr "^2.0.0" - fs-minipass "^2.0.0" - minipass "^3.0.0" - minizlib "^2.1.1" - mkdirp "^1.0.3" - yallist "^4.0.0" - -temp-dir@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d" - integrity sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0= - -temp-dir@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-2.0.0.tgz#bde92b05bdfeb1516e804c9c00ad45177f31321e" - integrity sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg== - -tempfile@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-2.0.0.tgz#6b0446856a9b1114d1856ffcbe509cccb0977265" - integrity sha1-awRGhWqbERTRhW/8vlCczLCXcmU= - dependencies: - temp-dir "^1.0.0" - uuid "^3.0.1" - -term-size@^2.1.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.2.0.tgz#1f16adedfe9bdc18800e1776821734086fcc6753" - integrity sha512-a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw== - -terser@^3.14.1: - version "3.17.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-3.17.0.tgz#f88ffbeda0deb5637f9d24b0da66f4e15ab10cb2" - integrity sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ== - dependencies: - commander "^2.19.0" - source-map "~0.6.1" - source-map-support "~0.5.10" - -text-hex@1.0.x: - version "1.0.0" - resolved "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz#69dc9c1b17446ee79a92bf5b884bb4b9127506f5" - integrity sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg== - -then-fs@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/then-fs/-/then-fs-2.0.0.tgz#72f792dd9d31705a91ae19ebfcf8b3f968c81da2" - integrity sha1-cveS3Z0xcFqRrhnr/Piz+WjIHaI= - dependencies: - promise ">=3.2 <8" - -throttleit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c" - integrity sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw= - -through2@^2.0.3: - version "2.0.5" - resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" - integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== - dependencies: - readable-stream "~2.3.6" - xtend "~4.0.1" - -through@^2.3.4, through@^2.3.6: - version "2.3.8" - resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" - integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= - -timsort@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" - integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= - -tmp@0.0.33, tmp@^0.0.33: - version "0.0.33" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" - integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw== - dependencies: - os-tmpdir "~1.0.2" - -tmp@0.2.1, tmp@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" - integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ== - dependencies: - rimraf "^3.0.0" - -tmp@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.1.0.tgz#ee434a4e22543082e294ba6201dcc6eafefa2877" - integrity sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw== - dependencies: - rimraf "^2.6.3" - -to-array@0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890" - integrity sha1-F+bBH3PdTz10zaek/zI46a2b+JA= - -to-object-path@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" - integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68= - dependencies: - kind-of "^3.0.2" - -to-readable-stream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771" - integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q== - -to-regex-range@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" - integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg= - dependencies: - is-number "^3.0.0" - repeat-string "^1.6.1" - -to-regex-range@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" - integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== - dependencies: - is-number "^7.0.0" - -to-regex@^3.0.1, to-regex@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" - integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw== - dependencies: - define-property "^2.0.2" - extend-shallow "^3.0.2" - regex-not "^1.0.2" - safe-regex "^1.1.0" - -toidentifier@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" - integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== - -toml@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/toml/-/toml-3.0.0.tgz#342160f1af1904ec9d204d03a5d61222d762c5ee" - integrity sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w== + "abbrev" "^1.1.1" + "ansi-escapes" "3.2.0" + "chalk" "^2.4.2" + "cli-spinner" "0.2.10" + "configstore" "^5.0.1" + "debug" "^4.1.1" + "diff" "^4.0.1" + "global-agent" "^2.1.12" + "hcl-to-json" "^0.1.1" + "lodash.assign" "^4.2.0" + "lodash.camelcase" "^4.3.0" + "lodash.clonedeep" "^4.5.0" + "lodash.endswith" "^4.2.1" + "lodash.flatten" "^4.4.0" + "lodash.flattendeep" "^4.4.0" + "lodash.get" "^4.4.2" + "lodash.groupby" "^4.6.0" + "lodash.isempty" "^4.4.0" + "lodash.isobject" "^3.0.2" + "lodash.map" "^4.6.0" + "lodash.omit" "^4.5.0" + "lodash.orderby" "^4.6.0" + "lodash.sortby" "^4.7.0" + "lodash.uniq" "^4.5.0" + "lodash.upperfirst" "^4.3.1" + "lodash.values" "^4.3.0" + "micromatch" "4.0.2" + "needle" "2.6.0" + "open" "^7.0.3" + "ora" "5.3.0" + "os-name" "^3.0.0" + "promise-queue" "^2.2.5" + "proxy-from-env" "^1.0.0" + "rimraf" "^2.6.3" + "semver" "^6.0.0" + "snyk-config" "4.0.0" + "snyk-cpp-plugin" "2.2.1" + "snyk-docker-plugin" "4.19.3" + "snyk-go-plugin" "1.17.0" + "snyk-gradle-plugin" "3.14.0" + "snyk-module" "3.1.0" + "snyk-mvn-plugin" "2.25.3" + "snyk-nodejs-lockfile-parser" "1.31.1" + "snyk-nuget-plugin" "1.21.0" + "snyk-php-plugin" "1.9.2" + "snyk-policy" "1.19.0" + "snyk-python-plugin" "1.19.7" + "snyk-resolve" "1.1.0" + "snyk-resolve-deps" "4.7.2" + "snyk-sbt-plugin" "2.11.0" + "snyk-tree" "^1.0.0" + "snyk-try-require" "1.3.1" + "source-map-support" "^0.5.11" + "strip-ansi" "^5.2.0" + "tar" "^6.1.0" + "tempfile" "^2.0.0" + "update-notifier" "^4.1.0" + "uuid" "^3.3.2" + "wrap-ansi" "^5.1.0" + +"socket.io-adapter@~1.1.0": + "integrity" "sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs=" + "resolved" "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz" + "version" "1.1.1" + +"socket.io-client@2.4.0": + "integrity" "sha512-M6xhnKQHuuZd4Ba9vltCLT9oa+YvTsP8j9NcEiLElfIg8KeYPyhWOes6x4t+LTAC8enQbE/995AdTem2uNyKKQ==" + "resolved" "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.4.0.tgz" + "version" "2.4.0" + dependencies: + "backo2" "1.0.2" + "component-bind" "1.0.0" + "component-emitter" "~1.3.0" + "debug" "~3.1.0" + "engine.io-client" "~3.5.0" + "has-binary2" "~1.0.2" + "indexof" "0.0.1" + "parseqs" "0.0.6" + "parseuri" "0.0.6" + "socket.io-parser" "~3.3.0" + "to-array" "0.1.4" + +"socket.io-parser@~3.3.0": + "integrity" "sha512-hczmV6bDgdaEbVqhAeVMM/jfUfzuEZHsQg6eOmLgJht6G3mPKMxYm75w2+qhAQZ+4X+1+ATZ+QFKeOZD5riHng==" + "resolved" "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.0.tgz" + "version" "3.3.0" + dependencies: + "component-emitter" "1.2.1" + "debug" "~3.1.0" + "isarray" "2.0.1" + +"socket.io-parser@~3.4.0": + "integrity" "sha512-/G/VOI+3DBp0+DJKW4KesGnQkQPFmUCbA/oO2QGT6CWxU7hLGWqU3tyuzeSK/dqcyeHsQg1vTe9jiZI8GU9SCQ==" + "resolved" "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.4.0.tgz" + "version" "3.4.0" + dependencies: + "component-emitter" "1.2.1" + "debug" "~4.1.0" + "isarray" "2.0.1" + +"socket.io@^2.4.0": + "integrity" "sha512-Si18v0mMXGAqLqCVpTxBa8MGqriHGQh8ccEOhmsmNS3thNCGBwO8WGrwMibANsWtQQ5NStdZwHqZR3naJVFc3w==" + "resolved" "https://registry.npmjs.org/socket.io/-/socket.io-2.4.1.tgz" + "version" "2.4.1" + dependencies: + "debug" "~4.1.0" + "engine.io" "~3.5.0" + "has-binary2" "~1.0.2" + "socket.io-adapter" "~1.1.0" + "socket.io-client" "2.4.0" + "socket.io-parser" "~3.4.0" + +"sortablejs@^1.7.0": + "integrity" "sha512-AftvD4hdKcR5QlGi7L/JST506zGNGrysE8/QohDpwKXJarHWqCt+TUlrtoMk/wkECB607Q019/OZlJViyWiD6A==" + "resolved" "https://registry.npmjs.org/sortablejs/-/sortablejs-1.8.3.tgz" + "version" "1.8.3" + +"source-map-resolve@^0.5.0": + "integrity" "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==" + "resolved" "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz" + "version" "0.5.2" + dependencies: + "atob" "^2.1.1" + "decode-uri-component" "^0.2.0" + "resolve-url" "^0.2.1" + "source-map-url" "^0.4.0" + "urix" "^0.1.0" + +"source-map-support@^0.5.11", "source-map-support@^0.5.7", "source-map-support@~0.5.10": + "integrity" "sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==" + "resolved" "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz" + "version" "0.5.16" + dependencies: + "buffer-from" "^1.0.0" + "source-map" "^0.6.0" + +"source-map-support@^0.5.19": + "integrity" "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==" + "resolved" "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz" + "version" "0.5.19" + dependencies: + "buffer-from" "^1.0.0" + "source-map" "^0.6.0" + +"source-map-url@^0.4.0": + "integrity" "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=" + "resolved" "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz" + "version" "0.4.0" + +"source-map@^0.4.2": + "integrity" "sha1-66T12pwNyZneaAMti092FzZSA2s=" + "resolved" "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz" + "version" "0.4.4" + dependencies: + "amdefine" ">=0.0.4" + +"source-map@^0.5.3": + "integrity" "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + "resolved" "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz" + "version" "0.5.7" + +"source-map@^0.5.6": + "integrity" "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + "resolved" "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz" + "version" "0.5.7" + +"source-map@^0.6.0", "source-map@^0.6.1", "source-map@~0.6.0", "source-map@~0.6.1", "source-map@0.6.*": + "integrity" "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + "resolved" "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz" + "version" "0.6.1" + +"sourcemap-codec@^1.4.4": + "integrity" "sha512-CYAPYdBu34781kLHkaW3m6b/uUSyMOC2R61gcYMWooeuaGtjof86ZA/8T+qVPPt7np1085CR9hmMGrySwEc8Xg==" + "resolved" "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.4.tgz" + "version" "1.4.4" + +"spdx-correct@^3.0.0": + "integrity" "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==" + "resolved" "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz" + "version" "3.1.1" + dependencies: + "spdx-expression-parse" "^3.0.0" + "spdx-license-ids" "^3.0.0" + +"spdx-exceptions@^2.1.0": + "integrity" "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==" + "resolved" "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz" + "version" "2.3.0" + +"spdx-expression-parse@^3.0.0": + "integrity" "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==" + "resolved" "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz" + "version" "3.0.1" + dependencies: + "spdx-exceptions" "^2.1.0" + "spdx-license-ids" "^3.0.0" + +"spdx-license-ids@^3.0.0": + "integrity" "sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw==" + "resolved" "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz" + "version" "3.0.6" + +"split-ca@^1.0.1": + "integrity" "sha1-bIOv82kvphJW4M0ZfgXp3hV2kaY=" + "resolved" "https://registry.npmjs.org/split-ca/-/split-ca-1.0.1.tgz" + "version" "1.0.1" + +"split-string@^3.0.1", "split-string@^3.0.2": + "integrity" "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==" + "resolved" "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz" + "version" "3.1.0" + dependencies: + "extend-shallow" "^3.0.0" + +"sprintf-js@^1.1.2": + "integrity" "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==" + "resolved" "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz" + "version" "1.1.2" + +"sprintf-js@~1.0.2": + "integrity" "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" + "resolved" "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz" + "version" "1.0.3" + +"ssh2-streams@~0.4.10": + "integrity" "sha512-8pnlMjvnIZJvmTzUIIA5nT4jr2ZWNNVHwyXfMGdRJbug9TpI3kd99ffglgfSWqujVv/0gxwMsDn9j9RVst8yhQ==" + "resolved" "https://registry.npmjs.org/ssh2-streams/-/ssh2-streams-0.4.10.tgz" + "version" "0.4.10" + dependencies: + "asn1" "~0.2.0" + "bcrypt-pbkdf" "^1.0.2" + "streamsearch" "~0.1.2" + +"ssh2@^0.8.7": + "integrity" "sha512-GmoNPxWDMkVpMFa9LVVzQZHF6EW3WKmBwL+4/GeILf2hFmix5Isxm7Amamo8o7bHiU0tC+wXsGcUXOxp8ChPaw==" + "resolved" "https://registry.npmjs.org/ssh2/-/ssh2-0.8.9.tgz" + "version" "0.8.9" + dependencies: + "ssh2-streams" "~0.4.10" + +"sshpk@^1.7.0": + "integrity" "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==" + "resolved" "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz" + "version" "1.16.1" + dependencies: + "asn1" "~0.2.3" + "assert-plus" "^1.0.0" + "bcrypt-pbkdf" "^1.0.0" + "dashdash" "^1.12.0" + "ecc-jsbn" "~0.1.1" + "getpass" "^0.1.1" + "jsbn" "~0.1.0" + "safer-buffer" "^2.0.2" + "tweetnacl" "~0.14.0" + +"stable@^0.1.8": + "integrity" "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==" + "resolved" "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz" + "version" "0.1.8" + +"stack-trace@0.0.x": + "integrity" "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=" + "resolved" "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz" + "version" "0.0.10" + +"static-extend@^0.1.1": + "integrity" "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=" + "resolved" "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz" + "version" "0.1.2" + dependencies: + "define-property" "^0.2.5" + "object-copy" "^0.1.0" + +"statuses@>= 1.5.0 < 2", "statuses@~1.5.0": + "integrity" "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" + "resolved" "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz" + "version" "1.5.0" + +"stdout-stream@^1.4.0": + "integrity" "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==" + "resolved" "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz" + "version" "1.4.1" + dependencies: + "readable-stream" "^2.0.1" + +"stream-shift@^1.0.0": + "integrity" "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==" + "resolved" "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz" + "version" "1.0.1" + +"streamsearch@~0.1.2": + "integrity" "sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo=" + "resolved" "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz" + "version" "0.1.2" + +"string_decoder@^1.1.1": + "integrity" "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==" + "resolved" "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz" + "version" "1.3.0" + dependencies: + "safe-buffer" "~5.2.0" + +"string_decoder@~1.1.1": + "integrity" "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==" + "resolved" "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz" + "version" "1.1.1" + dependencies: + "safe-buffer" "~5.1.0" + +"string-hash@^1.1.0", "string-hash@^1.1.1": + "integrity" "sha1-6Kr8CsGFW0Zmkp7X3RJ1311sgRs=" + "resolved" "https://registry.npmjs.org/string-hash/-/string-hash-1.1.3.tgz" + "version" "1.1.3" + +"string-width@^1.0.1": + "integrity" "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=" + "resolved" "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz" + "version" "1.0.2" + dependencies: + "code-point-at" "^1.0.0" + "is-fullwidth-code-point" "^1.0.0" + "strip-ansi" "^3.0.0" + +"string-width@^1.0.2 || 2": + "integrity" "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==" + "resolved" "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz" + "version" "2.1.1" + dependencies: + "is-fullwidth-code-point" "^2.0.0" + "strip-ansi" "^4.0.0" + +"string-width@^2.0.0", "string-width@^2.1.1": + "integrity" "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==" + "resolved" "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz" + "version" "2.1.1" + dependencies: + "is-fullwidth-code-point" "^2.0.0" + "strip-ansi" "^4.0.0" + +"string-width@^3.0.0", "string-width@^3.1.0": + "integrity" "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==" + "resolved" "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz" + "version" "3.1.0" + dependencies: + "emoji-regex" "^7.0.1" + "is-fullwidth-code-point" "^2.0.0" + "strip-ansi" "^5.1.0" + +"string-width@^4.0.0": + "integrity" "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==" + "resolved" "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz" + "version" "4.2.0" + dependencies: + "emoji-regex" "^8.0.0" + "is-fullwidth-code-point" "^3.0.0" + "strip-ansi" "^6.0.0" + +"string-width@^4.1.0": + "integrity" "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==" + "resolved" "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz" + "version" "4.2.0" + dependencies: + "emoji-regex" "^8.0.0" + "is-fullwidth-code-point" "^3.0.0" + "strip-ansi" "^6.0.0" -touch@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/touch/-/touch-3.1.0.tgz#fe365f5f75ec9ed4e56825e0bb76d24ab74af83b" - integrity sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA== - dependencies: - nopt "~1.0.10" - -tough-cookie@~2.4.3: - version "2.4.3" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781" - integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ== +"string.prototype.trimend@^1.0.0": + "integrity" "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==" + "resolved" "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz" + "version" "1.0.1" dependencies: - psl "^1.1.24" - punycode "^1.4.1" - -tough-cookie@~2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" - integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== + "define-properties" "^1.1.3" + "es-abstract" "^1.17.5" + +"string.prototype.trimleft@^2.1.1": + "integrity" "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==" + "resolved" "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz" + "version" "2.1.2" dependencies: - psl "^1.1.28" - punycode "^2.1.1" - -tree-kill@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc" - integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A== + "define-properties" "^1.1.3" + "es-abstract" "^1.17.5" + "string.prototype.trimstart" "^1.0.0" + +"string.prototype.trimright@^2.1.1": + "integrity" "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==" + "resolved" "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz" + "version" "2.1.2" + dependencies: + "define-properties" "^1.1.3" + "es-abstract" "^1.17.5" + "string.prototype.trimend" "^1.0.0" + +"string.prototype.trimstart@^1.0.0": + "integrity" "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==" + "resolved" "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz" + "version" "1.0.1" + dependencies: + "define-properties" "^1.1.3" + "es-abstract" "^1.17.5" + +"strip-ansi@^3.0.0", "strip-ansi@^3.0.1": + "integrity" "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=" + "resolved" "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz" + "version" "3.0.1" + dependencies: + "ansi-regex" "^2.0.0" + +"strip-ansi@^4.0.0": + "integrity" "sha1-qEeQIusaw2iocTibY1JixQXuNo8=" + "resolved" "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz" + "version" "4.0.0" + dependencies: + "ansi-regex" "^3.0.0" + +"strip-ansi@^5.0.0": + "integrity" "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==" + "resolved" "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz" + "version" "5.2.0" + dependencies: + "ansi-regex" "^4.1.0" + +"strip-ansi@^5.1.0": + "integrity" "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==" + "resolved" "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz" + "version" "5.2.0" + dependencies: + "ansi-regex" "^4.1.0" + +"strip-ansi@^5.2.0": + "integrity" "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==" + "resolved" "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz" + "version" "5.2.0" + dependencies: + "ansi-regex" "^4.1.0" + +"strip-ansi@^6.0.0": + "integrity" "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==" + "resolved" "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz" + "version" "6.0.0" + dependencies: + "ansi-regex" "^5.0.0" + +"strip-ansi@6.0.0": + "integrity" "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==" + "resolved" "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz" + "version" "6.0.0" + dependencies: + "ansi-regex" "^5.0.0" + +"strip-bom@^2.0.0": + "integrity" "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=" + "resolved" "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz" + "version" "2.0.0" + dependencies: + "is-utf8" "^0.2.0" + +"strip-eof@^1.0.0": + "integrity" "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=" + "resolved" "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz" + "version" "1.0.0" + +"strip-indent@^1.0.1": + "integrity" "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=" + "resolved" "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz" + "version" "1.0.1" + dependencies: + "get-stdin" "^4.0.1" + +"strip-json-comments@~2.0.1": + "integrity" "sha1-PFMZQukIwml8DsNEhYwobHygpgo=" + "resolved" "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz" + "version" "2.0.1" + +"style-inject@^0.3.0": + "integrity" "sha512-IezA2qp+vcdlhJaVm5SOdPPTUu0FCEqfNSli2vRuSIBbu5Nq5UvygTk/VzeCqfLz2Atj3dVII5QBKGZRZ0edzw==" + "resolved" "https://registry.npmjs.org/style-inject/-/style-inject-0.3.0.tgz" + "version" "0.3.0" + +"stylehacks@^4.0.0": + "integrity" "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==" + "resolved" "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz" + "version" "4.0.3" + dependencies: + "browserslist" "^4.0.0" + "postcss" "^7.0.0" + "postcss-selector-parser" "^3.0.0" + +"superagent@^3.8.2": + "integrity" "sha512-GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA==" + "resolved" "https://registry.npmjs.org/superagent/-/superagent-3.8.3.tgz" + "version" "3.8.3" + dependencies: + "component-emitter" "^1.2.0" + "cookiejar" "^2.1.0" + "debug" "^3.1.0" + "extend" "^3.0.0" + "form-data" "^2.3.1" + "formidable" "^1.2.0" + "methods" "^1.1.1" + "mime" "^1.4.1" + "qs" "^6.5.1" + "readable-stream" "^2.3.5" + +"supports-color@^2.0.0": + "integrity" "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" + "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz" + "version" "2.0.0" + +"supports-color@^3.2.3": + "integrity" "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=" + "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz" + "version" "3.2.3" + dependencies: + "has-flag" "^1.0.0" + +"supports-color@^5.3.0": + "integrity" "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==" + "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz" + "version" "5.5.0" + dependencies: + "has-flag" "^3.0.0" + +"supports-color@^5.4.0": + "integrity" "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==" + "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz" + "version" "5.5.0" + dependencies: + "has-flag" "^3.0.0" + +"supports-color@^6.1.0": + "integrity" "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==" + "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz" + "version" "6.1.0" + dependencies: + "has-flag" "^3.0.0" + +"supports-color@^7.1.0": + "integrity" "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==" + "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz" + "version" "7.1.0" + dependencies: + "has-flag" "^4.0.0" + +"supports-color@5.4.0": + "integrity" "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==" + "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz" + "version" "5.4.0" + dependencies: + "has-flag" "^3.0.0" + +"svg-sprite@^1.5.0": + "integrity" "sha512-0mE5BLY3K8wg3+HrYfzpiKbIM44IGcg8uINED8ri22EdQbLvGecOHjRtkrNAlphbiU5kyGyqoBlIaukL45fs2Q==" + "resolved" "https://registry.npmjs.org/svg-sprite/-/svg-sprite-1.5.0.tgz" + "version" "1.5.0" + dependencies: + "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" + +"svgo@^1.0.0": + "integrity" "sha512-xBfxJxfk4UeVN8asec9jNxHiv3UAMv/ujwBWGYvQhhMb2u3YTGKkiybPcLFDLq7GLLWE9wa73e0/m8L5nTzQbw==" + "resolved" "https://registry.npmjs.org/svgo/-/svgo-1.2.0.tgz" + "version" "1.2.0" + dependencies: + "chalk" "^2.4.1" + "coa" "^2.0.2" + "css-select" "^2.0.0" + "css-select-base-adapter" "^0.1.1" + "css-tree" "1.0.0-alpha.28" + "css-url-regex" "^1.1.0" + "csso" "^3.5.1" + "js-yaml" "^3.12.0" + "mkdirp" "~0.5.1" + "object.values" "^1.1.0" + "sax" "~1.2.4" + "stable" "^0.1.8" + "unquote" "~1.1.1" + "util.promisify" "~1.0.0" + +"svgo@^1.1.1": + "integrity" "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==" + "resolved" "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz" + "version" "1.3.2" + dependencies: + "chalk" "^2.4.1" + "coa" "^2.0.2" + "css-select" "^2.0.0" + "css-select-base-adapter" "^0.1.1" + "css-tree" "1.0.0-alpha.37" + "csso" "^4.0.2" + "js-yaml" "^3.13.1" + "mkdirp" "~0.5.1" + "object.values" "^1.1.0" + "sax" "~1.2.4" + "stable" "^0.1.8" + "unquote" "~1.1.1" + "util.promisify" "~1.0.0" + +"tar-stream@^2.1.0": + "integrity" "sha512-+DAn4Nb4+gz6WZigRzKEZl1QuJVOLtAwwF+WUxy1fJ6X63CaGaUAxJRD2KEn1OMfcbCjySTYpNC6WmfQoIEOdw==" + "resolved" "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.0.tgz" + "version" "2.1.0" + dependencies: + "bl" "^3.0.0" + "end-of-stream" "^1.4.1" + "fs-constants" "^1.0.0" + "inherits" "^2.0.3" + "readable-stream" "^3.1.1" + +"tar-stream@^2.1.2": + "integrity" "sha512-Z9yri56Dih8IaK8gncVPx4Wqt86NDmQTSh49XLZgjWpGZL9GK9HKParS2scqHCC4w6X9Gh2jwaU45V47XTKwVA==" + "resolved" "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.3.tgz" + "version" "2.1.3" + dependencies: + "bl" "^4.0.1" + "end-of-stream" "^1.4.1" + "fs-constants" "^1.0.0" + "inherits" "^2.0.3" + "readable-stream" "^3.1.1" + +"tar@^2.0.0": + "integrity" "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==" + "resolved" "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz" + "version" "2.2.2" + dependencies: + "block-stream" "*" + "fstream" "^1.0.12" + "inherits" "2" + +"tar@^6.1.0": + "integrity" "sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==" + "resolved" "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz" + "version" "6.1.0" + dependencies: + "chownr" "^2.0.0" + "fs-minipass" "^2.0.0" + "minipass" "^3.0.0" + "minizlib" "^2.1.1" + "mkdirp" "^1.0.3" + "yallist" "^4.0.0" + +"temp-dir@^1.0.0": + "integrity" "sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=" + "resolved" "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz" + "version" "1.0.0" + +"temp-dir@^2.0.0": + "integrity" "sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==" + "resolved" "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz" + "version" "2.0.0" + +"tempfile@^2.0.0": + "integrity" "sha1-awRGhWqbERTRhW/8vlCczLCXcmU=" + "resolved" "https://registry.npmjs.org/tempfile/-/tempfile-2.0.0.tgz" + "version" "2.0.0" + dependencies: + "temp-dir" "^1.0.0" + "uuid" "^3.0.1" + +"term-size@^2.1.0": + "integrity" "sha512-a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw==" + "resolved" "https://registry.npmjs.org/term-size/-/term-size-2.2.0.tgz" + "version" "2.2.0" + +"terser@^3.14.1": + "integrity" "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==" + "resolved" "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz" + "version" "3.17.0" + dependencies: + "commander" "^2.19.0" + "source-map" "~0.6.1" + "source-map-support" "~0.5.10" + +"text-hex@1.0.x": + "integrity" "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==" + "resolved" "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz" + "version" "1.0.0" + +"then-fs@^2.0.0": + "integrity" "sha1-cveS3Z0xcFqRrhnr/Piz+WjIHaI=" + "resolved" "https://registry.npmjs.org/then-fs/-/then-fs-2.0.0.tgz" + "version" "2.0.0" + dependencies: + "promise" ">=3.2 <8" + +"throttleit@^1.0.0": + "integrity" "sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw=" + "resolved" "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz" + "version" "1.0.0" + +"through@^2.3.4", "through@^2.3.6": + "integrity" "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" + "resolved" "https://registry.npmjs.org/through/-/through-2.3.8.tgz" + "version" "2.3.8" + +"through2@^2.0.3": + "integrity" "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==" + "resolved" "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz" + "version" "2.0.5" + dependencies: + "readable-stream" "~2.3.6" + "xtend" "~4.0.1" + +"timsort@^0.3.0": + "integrity" "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=" + "resolved" "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz" + "version" "0.3.0" + +"tmp@^0.0.33": + "integrity" "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==" + "resolved" "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz" + "version" "0.0.33" + dependencies: + "os-tmpdir" "~1.0.2" + +"tmp@^0.1.0": + "integrity" "sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==" + "resolved" "https://registry.npmjs.org/tmp/-/tmp-0.1.0.tgz" + "version" "0.1.0" + dependencies: + "rimraf" "^2.6.3" + +"tmp@^0.2.1", "tmp@0.2.1": + "integrity" "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==" + "resolved" "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz" + "version" "0.2.1" + dependencies: + "rimraf" "^3.0.0" + +"tmp@0.0.33": + "integrity" "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==" + "resolved" "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz" + "version" "0.0.33" + dependencies: + "os-tmpdir" "~1.0.2" + +"to-array@0.1.4": + "integrity" "sha1-F+bBH3PdTz10zaek/zI46a2b+JA=" + "resolved" "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz" + "version" "0.1.4" + +"to-object-path@^0.3.0": + "integrity" "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=" + "resolved" "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz" + "version" "0.3.0" + dependencies: + "kind-of" "^3.0.2" + +"to-readable-stream@^1.0.0": + "integrity" "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==" + "resolved" "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz" + "version" "1.0.0" + +"to-regex-range@^2.1.0": + "integrity" "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=" + "resolved" "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz" + "version" "2.1.1" + dependencies: + "is-number" "^3.0.0" + "repeat-string" "^1.6.1" + +"to-regex-range@^5.0.1": + "integrity" "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==" + "resolved" "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz" + "version" "5.0.1" + dependencies: + "is-number" "^7.0.0" + +"to-regex@^3.0.1", "to-regex@^3.0.2": + "integrity" "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==" + "resolved" "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz" + "version" "3.0.2" + dependencies: + "define-property" "^2.0.2" + "extend-shallow" "^3.0.2" + "regex-not" "^1.0.2" + "safe-regex" "^1.1.0" + +"toidentifier@1.0.0": + "integrity" "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==" + "resolved" "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz" + "version" "1.0.0" + +"toml@^3.0.0": + "integrity" "sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w==" + "resolved" "https://registry.npmjs.org/toml/-/toml-3.0.0.tgz" + "version" "3.0.0" + +"touch@^3.1.0": + "integrity" "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==" + "resolved" "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz" + "version" "3.1.0" + dependencies: + "nopt" "~1.0.10" + +"tough-cookie@~2.4.3": + "integrity" "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==" + "resolved" "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz" + "version" "2.4.3" + dependencies: + "psl" "^1.1.24" + "punycode" "^1.4.1" + +"tough-cookie@~2.5.0": + "integrity" "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==" + "resolved" "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz" + "version" "2.5.0" + dependencies: + "psl" "^1.1.28" + "punycode" "^2.1.1" + +"tree-kill@^1.2.2": + "integrity" "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==" + "resolved" "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz" + "version" "1.2.2" -trim-newlines@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613" - integrity sha1-WIeWa7WCpFA6QetST301ARgVphM= +"trim-newlines@^1.0.0": + "integrity" "sha1-WIeWa7WCpFA6QetST301ARgVphM=" + "resolved" "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz" + "version" "1.0.0" -triple-beam@^1.2.0, triple-beam@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9" - integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw== +"triple-beam@^1.2.0", "triple-beam@^1.3.0": + "integrity" "sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==" + "resolved" "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz" + "version" "1.3.0" "true-case-path@^1.0.2": - version "1.0.3" - resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.3.tgz#f813b5a8c86b40da59606722b144e3225799f47d" - integrity sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew== - dependencies: - glob "^7.1.2" - -tslib@1.11.1: - version "1.11.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35" - integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA== - -tslib@^1, tslib@^1.10.0, tslib@^1.9.0, tslib@^1.9.3: - version "1.10.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a" - integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ== - -tslib@^1.11.2, tslib@^1.13.0: - version "1.13.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043" - integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q== - -tslib@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.1.tgz#410eb0d113e5b6356490eec749603725b021b43e" - integrity sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ== - -tslib@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" - integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A== - -tunnel-agent@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" - integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= - dependencies: - safe-buffer "^5.0.1" - -tweetnacl@^0.14.3, tweetnacl@~0.14.0: - version "0.14.5" - resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" - integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= - -type-fest@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1" - integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ== - -type-fest@^0.13.1: - version "0.13.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934" - integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg== - -type-fest@^0.8.1: - version "0.8.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" - integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== - -type-is@~1.6.17, type-is@~1.6.18: - version "1.6.18" - resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" - integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== - dependencies: - media-typer "0.3.0" - mime-types "~2.1.24" - -typedarray-to-buffer@^3.1.5: - version "3.1.5" - resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" - integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q== - dependencies: - is-typedarray "^1.0.0" - -typedarray@^0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" - integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= - -unicode-canonical-property-names-ecmascript@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818" - integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ== - -unicode-match-property-ecmascript@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c" - integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg== - dependencies: - unicode-canonical-property-names-ecmascript "^1.0.4" - unicode-property-aliases-ecmascript "^1.0.4" - -unicode-match-property-value-ecmascript@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.0.2.tgz#9f1dc76926d6ccf452310564fd834ace059663d4" - integrity sha512-Rx7yODZC1L/T8XKo/2kNzVAQaRE88AaMvI1EF/Xnj3GW2wzN6fop9DDWuFAKUVFH7vozkz26DzP0qyWLKLIVPQ== - -unicode-property-aliases-ecmascript@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz#5a533f31b4317ea76f17d807fa0d116546111dd0" - integrity sha512-2WSLa6OdYd2ng8oqiGIWnJqyFArvhn+5vgx5GTxMbUYjCYKUcuKS62YLFF0R/BDGlB1yzXjQOLtPAfHsgirEpg== - -union-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4" - integrity sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ= - dependencies: - arr-union "^3.1.0" - get-value "^2.0.6" - is-extendable "^0.1.1" - set-value "^0.4.3" - -uniq@^1.0.0, uniq@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff" - integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8= - -uniqs@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02" - integrity sha1-/+3ks2slKQaW5uFl1KWe25mOawI= - -unique-string@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d" - integrity sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg== - dependencies: - crypto-random-string "^2.0.0" - -unpipe@1.0.0, unpipe@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" - integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= - -unquote@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544" - integrity sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ= - -unset-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" - integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk= - dependencies: - has-value "^0.3.1" - isobject "^3.0.0" - -update-notifier@^4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.1.1.tgz#895fc8562bbe666179500f9f2cebac4f26323746" - integrity sha512-9y+Kds0+LoLG6yN802wVXoIfxYEwh3FlZwzMwpCZp62S2i1/Jzeqb9Eeeju3NSHccGGasfGlK5/vEHbAifYRDg== - dependencies: - boxen "^4.2.0" - chalk "^3.0.0" - configstore "^5.0.1" - has-yarn "^2.1.0" - import-lazy "^2.1.0" - is-ci "^2.0.0" - is-installed-globally "^0.3.1" - is-npm "^4.0.0" - is-yarn-global "^0.3.0" - latest-version "^5.0.0" - pupa "^2.0.1" - semver-diff "^3.1.1" - xdg-basedir "^4.0.0" - -uri-js@^4.2.2: - version "4.4.0" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz#aa714261de793e8a82347a7bcc9ce74e86f28602" - integrity sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g== - dependencies: - punycode "^2.1.0" - -urix@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" - integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= - -url-parse-lax@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" - integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww= - dependencies: - prepend-http "^2.0.0" - -url-polyfill@^1.1.8: - version "1.1.12" - resolved "https://registry.yarnpkg.com/url-polyfill/-/url-polyfill-1.1.12.tgz#6cdaa17f6b022841b3aec0bf8dbd87ac0cd33331" - integrity sha512-mYFmBHCapZjtcNHW0MDq9967t+z4Dmg5CJ0KqysK3+ZbyoNOWQHksGCTWwDhxGXllkWlOc10Xfko6v4a3ucM6A== - -use@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" - integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== - -utf8@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/utf8/-/utf8-3.0.0.tgz#f052eed1364d696e769ef058b183df88c87f69d1" - integrity sha512-E8VjFIQ/TyQgp+TZfS6l8yp/xWppSAHzidGiRrqe4bK4XP9pTRyKFgGJpO3SN7zdX4DeomTrwaseCHovfpFcqQ== - -util-deprecate@^1.0.1, util-deprecate@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= - -util.promisify@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030" - integrity sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA== - dependencies: - define-properties "^1.1.2" - object.getownpropertydescriptors "^2.0.3" - -utils-merge@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" - integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= - -uuid@^3.0.1, uuid@^3.3.2: - version "3.4.0" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" - integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== - -uuid@^8.2.0: - version "8.3.0" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.0.tgz#ab738085ca22dc9a8c92725e459b1d507df5d6ea" - integrity sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ== - -uuid@^8.3.0: - version "8.3.1" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.1.tgz#2ba2e6ca000da60fce5a196954ab241131e05a31" - integrity sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg== - -uuid@^8.3.2: - version "8.3.2" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" - integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== - -validate-npm-package-license@^3.0.1: - version "3.0.4" - resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" - integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== - dependencies: - spdx-correct "^3.0.0" - spdx-expression-parse "^3.0.0" - -vary@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" - integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= - -vendors@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.2.tgz#7fcb5eef9f5623b156bcea89ec37d63676f21801" - integrity sha512-w/hry/368nO21AN9QljsaIhb9ZiZtZARoVH5f3CsFbawdLdayCgKRPup7CggujvySMxx0I91NOyxdVENohprLQ== - -verror@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" - integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= - dependencies: - assert-plus "^1.0.0" - core-util-is "1.0.2" - extsprintf "^1.2.0" - -vinyl@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz#d85b07da96e458d25b2ffe19fece9f2caa13ed86" - integrity sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg== - dependencies: - clone "^2.1.1" - clone-buffer "^1.0.0" - clone-stats "^1.0.0" - cloneable-readable "^1.0.0" - remove-trailing-separator "^1.0.1" - replace-ext "^1.0.0" - -vlq@^0.2.2: - version "0.2.3" - resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26" - integrity sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow== - -vlq@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/vlq/-/vlq-1.0.0.tgz#8101be90843422954c2b13eb27f2f3122bdcc806" - integrity sha512-o3WmXySo+oI5thgqr7Qy8uBkT/v9Zr+sRyrh1lr8aWPUkgDWdWt4Nae2WKBrLsocgE8BuWWD0jLc+VW8LeU+2g== - -vscode-languageserver-types@^3.16.0: - version "3.16.0" - resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz#ecf393fc121ec6974b2da3efb3155644c514e247" - integrity sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA== - -vue-router@^2.0.0: - version "2.8.1" - resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-2.8.1.tgz#9833c9ee57ac83beb0269056fefee71713f20695" - integrity sha512-MC4jacHBhTPKtmcfzvaj2N7g6jgJ/Z/eIjZdt+yUaUOM1iKC0OUIlO/xCtz6OZFFTNUJs/1YNro2GN/lE+nOXA== - -vue-template-compiler@^2.6.11: - version "2.6.11" - resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.11.tgz#c04704ef8f498b153130018993e56309d4698080" - integrity sha512-KIq15bvQDrcCjpGjrAhx4mUlyyHfdmTaoNfeoATHLAiWB+MU3cx4lOzMwrnUh9cCxy0Lt1T11hAFY6TQgroUAA== - dependencies: - de-indent "^1.0.2" - he "^1.1.0" - -vue-template-es2015-compiler@^1.6.0, vue-template-es2015-compiler@^1.9.0: - version "1.9.1" - resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825" - integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw== - -vue@^2.6.11: - version "2.6.11" - resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.11.tgz#76594d877d4b12234406e84e35275c6d514125c5" - integrity sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ== - -wcwidth@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8" - integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g= - dependencies: - defaults "^1.0.3" - -which-boxed-primitive@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.1.tgz#cbe8f838ebe91ba2471bb69e9edbda67ab5a5ec1" - integrity sha512-7BT4TwISdDGBgaemWU0N0OU7FeAEJ9Oo2P1PHRm/FCWoEi2VLWC9b6xvxAA3C/NMpxg3HXVgi0sMmGbNUbNepQ== - dependencies: - is-bigint "^1.0.0" - is-boolean-object "^1.0.0" - is-number-object "^1.0.3" - is-string "^1.0.4" - is-symbol "^1.0.2" - -which-collection@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.1.tgz#70eab71ebbbd2aefaf32f917082fc62cdcb70906" - integrity sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A== - dependencies: - is-map "^2.0.1" - is-set "^2.0.1" - is-weakmap "^2.0.1" - is-weakset "^2.0.1" - -which-module@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" - integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= - -which-typed-array@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.2.tgz#e5f98e56bda93e3dac196b01d47c1156679c00b2" - integrity sha512-KT6okrd1tE6JdZAy3o2VhMoYPh3+J6EMZLyrxBQsZflI1QCZIxMrIYLkosd8Twf+YfknVIHmYQPgJt238p8dnQ== - dependencies: - available-typed-arrays "^1.0.2" - es-abstract "^1.17.5" - foreach "^2.0.5" - function-bind "^1.1.1" - has-symbols "^1.0.1" - is-typed-array "^1.1.3" - -which@1, which@^1.2.10, which@^1.2.14, which@^1.2.9: - version "1.3.1" - resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" - integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== - dependencies: - isexe "^2.0.0" - -wide-align@^1.1.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" - integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA== - dependencies: - string-width "^1.0.2 || 2" - -widest-line@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" - integrity sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg== - dependencies: - string-width "^4.0.0" - -windows-release@^3.1.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/windows-release/-/windows-release-3.2.0.tgz#8122dad5afc303d833422380680a79cdfa91785f" - integrity sha512-QTlz2hKLrdqukrsapKsINzqMgOUpQW268eJ0OaOpJN32h272waxR9fkB9VoWRtK7uKHG5EHJcTXQBD8XZVJkFA== - dependencies: - execa "^1.0.0" - -winston-transport@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.4.0.tgz#17af518daa690d5b2ecccaa7acf7b20ca7925e59" - integrity sha512-Lc7/p3GtqtqPBYYtS6KCN3c77/2QCev51DvcJKbkFPQNoj1sinkGwLGFDxkXY9J6p9+EPnYs+D90uwbnaiURTw== - dependencies: - readable-stream "^2.3.7" - triple-beam "^1.2.0" - -winston@^3.1.0: - version "3.3.3" - resolved "https://registry.yarnpkg.com/winston/-/winston-3.3.3.tgz#ae6172042cafb29786afa3d09c8ff833ab7c9170" - integrity sha512-oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw== + "integrity" "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==" + "resolved" "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz" + "version" "1.0.3" + dependencies: + "glob" "^7.1.2" + +"tslib@^1.11.2": + "integrity" "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==" + "resolved" "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz" + "version" "1.13.0" + +"tslib@^1.13.0": + "integrity" "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==" + "resolved" "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz" + "version" "1.13.0" + +"tslib@^1", "tslib@^1.10.0", "tslib@^1.9.0", "tslib@^1.9.3": + "integrity" "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==" + "resolved" "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz" + "version" "1.10.0" + +"tslib@^2.0.0": + "integrity" "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==" + "resolved" "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz" + "version" "2.0.1" + +"tslib@^2.1.0": + "integrity" "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==" + "resolved" "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz" + "version" "2.1.0" + +"tslib@1.11.1": + "integrity" "sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==" + "resolved" "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz" + "version" "1.11.1" + +"tunnel-agent@^0.6.0": + "integrity" "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=" + "resolved" "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz" + "version" "0.6.0" + dependencies: + "safe-buffer" "^5.0.1" + +"tweetnacl@^0.14.3", "tweetnacl@~0.14.0": + "integrity" "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" + "resolved" "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz" + "version" "0.14.5" + +"type-fest@^0.11.0": + "integrity" "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==" + "resolved" "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz" + "version" "0.11.0" + +"type-fest@^0.13.1": + "integrity" "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==" + "resolved" "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz" + "version" "0.13.1" + +"type-fest@^0.8.1": + "integrity" "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==" + "resolved" "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz" + "version" "0.8.1" + +"type-is@~1.6.17", "type-is@~1.6.18": + "integrity" "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==" + "resolved" "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz" + "version" "1.6.18" + dependencies: + "media-typer" "0.3.0" + "mime-types" "~2.1.24" + +"typedarray-to-buffer@^3.1.5": + "integrity" "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==" + "resolved" "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz" + "version" "3.1.5" + dependencies: + "is-typedarray" "^1.0.0" + +"typedarray@^0.0.6": + "integrity" "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" + "resolved" "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz" + "version" "0.0.6" + +"unicode-canonical-property-names-ecmascript@^1.0.4": + "integrity" "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==" + "resolved" "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz" + "version" "1.0.4" + +"unicode-match-property-ecmascript@^1.0.4": + "integrity" "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==" + "resolved" "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz" + "version" "1.0.4" + dependencies: + "unicode-canonical-property-names-ecmascript" "^1.0.4" + "unicode-property-aliases-ecmascript" "^1.0.4" + +"unicode-match-property-value-ecmascript@^1.0.2": + "integrity" "sha512-Rx7yODZC1L/T8XKo/2kNzVAQaRE88AaMvI1EF/Xnj3GW2wzN6fop9DDWuFAKUVFH7vozkz26DzP0qyWLKLIVPQ==" + "resolved" "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.0.2.tgz" + "version" "1.0.2" + +"unicode-property-aliases-ecmascript@^1.0.4": + "integrity" "sha512-2WSLa6OdYd2ng8oqiGIWnJqyFArvhn+5vgx5GTxMbUYjCYKUcuKS62YLFF0R/BDGlB1yzXjQOLtPAfHsgirEpg==" + "resolved" "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz" + "version" "1.0.4" + +"union-value@^1.0.0": + "integrity" "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==" + "resolved" "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz" + "version" "1.0.1" + dependencies: + "arr-union" "^3.1.0" + "get-value" "^2.0.6" + "is-extendable" "^0.1.1" + "set-value" "^2.0.1" + +"uniq@^1.0.0", "uniq@^1.0.1": + "integrity" "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=" + "resolved" "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz" + "version" "1.0.1" + +"uniqs@^2.0.0": + "integrity" "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=" + "resolved" "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz" + "version" "2.0.0" + +"unique-string@^2.0.0": + "integrity" "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==" + "resolved" "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz" + "version" "2.0.0" + dependencies: + "crypto-random-string" "^2.0.0" + +"unpipe@~1.0.0", "unpipe@1.0.0": + "integrity" "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=" + "resolved" "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz" + "version" "1.0.0" + +"unquote@~1.1.1": + "integrity" "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=" + "resolved" "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz" + "version" "1.1.1" + +"unset-value@^1.0.0": + "integrity" "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=" + "resolved" "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz" + "version" "1.0.0" + dependencies: + "has-value" "^0.3.1" + "isobject" "^3.0.0" + +"update-notifier@^4.1.0": + "integrity" "sha512-9y+Kds0+LoLG6yN802wVXoIfxYEwh3FlZwzMwpCZp62S2i1/Jzeqb9Eeeju3NSHccGGasfGlK5/vEHbAifYRDg==" + "resolved" "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.1.tgz" + "version" "4.1.1" + dependencies: + "boxen" "^4.2.0" + "chalk" "^3.0.0" + "configstore" "^5.0.1" + "has-yarn" "^2.1.0" + "import-lazy" "^2.1.0" + "is-ci" "^2.0.0" + "is-installed-globally" "^0.3.1" + "is-npm" "^4.0.0" + "is-yarn-global" "^0.3.0" + "latest-version" "^5.0.0" + "pupa" "^2.0.1" + "semver-diff" "^3.1.1" + "xdg-basedir" "^4.0.0" + +"uri-js@^4.2.2": + "integrity" "sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==" + "resolved" "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz" + "version" "4.4.0" + dependencies: + "punycode" "^2.1.0" + +"urix@^0.1.0": + "integrity" "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=" + "resolved" "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz" + "version" "0.1.0" + +"url-parse-lax@^3.0.0": + "integrity" "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=" + "resolved" "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz" + "version" "3.0.0" + dependencies: + "prepend-http" "^2.0.0" + +"url-polyfill@^1.1.8": + "integrity" "sha512-mYFmBHCapZjtcNHW0MDq9967t+z4Dmg5CJ0KqysK3+ZbyoNOWQHksGCTWwDhxGXllkWlOc10Xfko6v4a3ucM6A==" + "resolved" "https://registry.npmjs.org/url-polyfill/-/url-polyfill-1.1.12.tgz" + "version" "1.1.12" + +"use@^3.1.0": + "integrity" "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==" + "resolved" "https://registry.npmjs.org/use/-/use-3.1.1.tgz" + "version" "3.1.1" + +"utf8@^3.0.0": + "integrity" "sha512-E8VjFIQ/TyQgp+TZfS6l8yp/xWppSAHzidGiRrqe4bK4XP9pTRyKFgGJpO3SN7zdX4DeomTrwaseCHovfpFcqQ==" + "resolved" "https://registry.npmjs.org/utf8/-/utf8-3.0.0.tgz" + "version" "3.0.0" + +"util-deprecate@^1.0.1", "util-deprecate@~1.0.1": + "integrity" "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + "resolved" "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" + "version" "1.0.2" + +"util.promisify@~1.0.0": + "integrity" "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==" + "resolved" "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz" + "version" "1.0.0" + dependencies: + "define-properties" "^1.1.2" + "object.getownpropertydescriptors" "^2.0.3" + +"utils-merge@1.0.1": + "integrity" "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=" + "resolved" "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz" + "version" "1.0.1" + +"uuid@^3.0.1", "uuid@^3.3.2": + "integrity" "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" + "resolved" "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz" + "version" "3.4.0" + +"uuid@^8.2.0": + "integrity" "sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ==" + "resolved" "https://registry.npmjs.org/uuid/-/uuid-8.3.0.tgz" + "version" "8.3.0" + +"uuid@^8.3.0": + "integrity" "sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==" + "resolved" "https://registry.npmjs.org/uuid/-/uuid-8.3.1.tgz" + "version" "8.3.1" + +"uuid@^8.3.2": + "integrity" "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" + "resolved" "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz" + "version" "8.3.2" + +"validate-npm-package-license@^3.0.1": + "integrity" "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==" + "resolved" "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz" + "version" "3.0.4" + dependencies: + "spdx-correct" "^3.0.0" + "spdx-expression-parse" "^3.0.0" + +"vary@~1.1.2": + "integrity" "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" + "resolved" "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz" + "version" "1.1.2" + +"vendors@^1.0.0": + "integrity" "sha512-w/hry/368nO21AN9QljsaIhb9ZiZtZARoVH5f3CsFbawdLdayCgKRPup7CggujvySMxx0I91NOyxdVENohprLQ==" + "resolved" "https://registry.npmjs.org/vendors/-/vendors-1.0.2.tgz" + "version" "1.0.2" + +"verror@1.10.0": + "integrity" "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=" + "resolved" "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz" + "version" "1.10.0" + dependencies: + "assert-plus" "^1.0.0" + "core-util-is" "1.0.2" + "extsprintf" "^1.2.0" + +"vinyl@^2.2.0": + "integrity" "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==" + "resolved" "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz" + "version" "2.2.0" + dependencies: + "clone" "^2.1.1" + "clone-buffer" "^1.0.0" + "clone-stats" "^1.0.0" + "cloneable-readable" "^1.0.0" + "remove-trailing-separator" "^1.0.1" + "replace-ext" "^1.0.0" + +"vlq@^0.2.2": + "integrity" "sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==" + "resolved" "https://registry.npmjs.org/vlq/-/vlq-0.2.3.tgz" + "version" "0.2.3" + +"vlq@^1.0.0": + "integrity" "sha512-o3WmXySo+oI5thgqr7Qy8uBkT/v9Zr+sRyrh1lr8aWPUkgDWdWt4Nae2WKBrLsocgE8BuWWD0jLc+VW8LeU+2g==" + "resolved" "https://registry.npmjs.org/vlq/-/vlq-1.0.0.tgz" + "version" "1.0.0" + +"vscode-languageserver-types@^3.16.0": + "integrity" "sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==" + "resolved" "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz" + "version" "3.16.0" + +"vue-router@^2.0.0": + "integrity" "sha512-MC4jacHBhTPKtmcfzvaj2N7g6jgJ/Z/eIjZdt+yUaUOM1iKC0OUIlO/xCtz6OZFFTNUJs/1YNro2GN/lE+nOXA==" + "resolved" "https://registry.npmjs.org/vue-router/-/vue-router-2.8.1.tgz" + "version" "2.8.1" + +"vue-template-compiler@*", "vue-template-compiler@^2.6.11": + "integrity" "sha512-KIq15bvQDrcCjpGjrAhx4mUlyyHfdmTaoNfeoATHLAiWB+MU3cx4lOzMwrnUh9cCxy0Lt1T11hAFY6TQgroUAA==" + "resolved" "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.11.tgz" + "version" "2.6.11" + dependencies: + "de-indent" "^1.0.2" + "he" "^1.1.0" + +"vue-template-es2015-compiler@^1.6.0", "vue-template-es2015-compiler@^1.9.0": + "integrity" "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==" + "resolved" "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz" + "version" "1.9.1" + +"vue@^2.6.11": + "integrity" "sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ==" + "resolved" "https://registry.npmjs.org/vue/-/vue-2.6.11.tgz" + "version" "2.6.11" + +"wcwidth@^1.0.1": + "integrity" "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=" + "resolved" "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz" + "version" "1.0.1" + dependencies: + "defaults" "^1.0.3" + +"which-boxed-primitive@^1.0.1": + "integrity" "sha512-7BT4TwISdDGBgaemWU0N0OU7FeAEJ9Oo2P1PHRm/FCWoEi2VLWC9b6xvxAA3C/NMpxg3HXVgi0sMmGbNUbNepQ==" + "resolved" "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.1.tgz" + "version" "1.0.1" + dependencies: + "is-bigint" "^1.0.0" + "is-boolean-object" "^1.0.0" + "is-number-object" "^1.0.3" + "is-string" "^1.0.4" + "is-symbol" "^1.0.2" + +"which-collection@^1.0.1": + "integrity" "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==" + "resolved" "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz" + "version" "1.0.1" + dependencies: + "is-map" "^2.0.1" + "is-set" "^2.0.1" + "is-weakmap" "^2.0.1" + "is-weakset" "^2.0.1" + +"which-module@^2.0.0": + "integrity" "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" + "resolved" "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz" + "version" "2.0.0" + +"which-typed-array@^1.1.2": + "integrity" "sha512-KT6okrd1tE6JdZAy3o2VhMoYPh3+J6EMZLyrxBQsZflI1QCZIxMrIYLkosd8Twf+YfknVIHmYQPgJt238p8dnQ==" + "resolved" "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.2.tgz" + "version" "1.1.2" + dependencies: + "available-typed-arrays" "^1.0.2" + "es-abstract" "^1.17.5" + "foreach" "^2.0.5" + "function-bind" "^1.1.1" + "has-symbols" "^1.0.1" + "is-typed-array" "^1.1.3" + +"which@^1.2.10", "which@^1.2.14", "which@^1.2.9", "which@1": + "integrity" "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==" + "resolved" "https://registry.npmjs.org/which/-/which-1.3.1.tgz" + "version" "1.3.1" + dependencies: + "isexe" "^2.0.0" + +"wide-align@^1.1.0": + "integrity" "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==" + "resolved" "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz" + "version" "1.1.3" + dependencies: + "string-width" "^1.0.2 || 2" + +"widest-line@^3.1.0": + "integrity" "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==" + "resolved" "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz" + "version" "3.1.0" + dependencies: + "string-width" "^4.0.0" + +"windows-release@^3.1.0": + "integrity" "sha512-QTlz2hKLrdqukrsapKsINzqMgOUpQW268eJ0OaOpJN32h272waxR9fkB9VoWRtK7uKHG5EHJcTXQBD8XZVJkFA==" + "resolved" "https://registry.npmjs.org/windows-release/-/windows-release-3.2.0.tgz" + "version" "3.2.0" + dependencies: + "execa" "^1.0.0" + +"winston-transport@^4.4.0": + "integrity" "sha512-Lc7/p3GtqtqPBYYtS6KCN3c77/2QCev51DvcJKbkFPQNoj1sinkGwLGFDxkXY9J6p9+EPnYs+D90uwbnaiURTw==" + "resolved" "https://registry.npmjs.org/winston-transport/-/winston-transport-4.4.0.tgz" + "version" "4.4.0" + dependencies: + "readable-stream" "^2.3.7" + "triple-beam" "^1.2.0" + +"winston@^3.1.0": + "integrity" "sha512-oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw==" + "resolved" "https://registry.npmjs.org/winston/-/winston-3.3.3.tgz" + "version" "3.3.3" dependencies: "@dabh/diagnostics" "^2.0.2" - async "^3.1.0" - is-stream "^2.0.0" - logform "^2.2.0" - one-time "^1.0.0" - readable-stream "^3.4.0" - stack-trace "0.0.x" - triple-beam "^1.3.0" - winston-transport "^4.4.0" - -wrap-ansi@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" - integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU= - dependencies: - string-width "^1.0.1" - strip-ansi "^3.0.1" - -wrap-ansi@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09" - integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q== - dependencies: - ansi-styles "^3.2.0" - string-width "^3.0.0" - strip-ansi "^5.0.0" - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= - -write-file-atomic@^3.0.0: - version "3.0.3" - resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8" - integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q== - dependencies: - imurmurhash "^0.1.4" - is-typedarray "^1.0.0" - signal-exit "^3.0.2" - typedarray-to-buffer "^3.1.5" - -ws@~7.4.2: - version "7.4.2" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.2.tgz#782100048e54eb36fe9843363ab1c68672b261dd" - integrity sha512-T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA== - -xdg-basedir@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13" - integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q== - -xml-js@^1.6.11: - version "1.6.11" - resolved "https://registry.yarnpkg.com/xml-js/-/xml-js-1.6.11.tgz#927d2f6947f7f1c19a316dd8eea3614e8b18f8e9" - integrity sha512-7rVi2KMfwfWFl+GpPg6m80IVMWXLRjO+PxTq7V2CDhoGak0wzYzFgUY2m4XJ47OGdXd8eLE8EmwfAmdjw7lC1g== - dependencies: - sax "^1.2.4" - -xml2js@0.4.23, xml2js@^0.4.17: - version "0.4.23" - resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66" - integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug== - dependencies: - sax ">=0.6.0" - xmlbuilder "~11.0.0" - -xmlbuilder@~11.0.0: - version "11.0.1" - resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3" - integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA== - -xmldom@0.1.27: - version "0.1.27" - resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9" - integrity sha1-1QH5ezvbQDr4757MIFcxh6rawOk= - -xmlhttprequest-ssl@~1.5.4: - version "1.5.5" - resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e" - integrity sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4= - -xpath@^0.0.27: - version "0.0.27" - resolved "https://registry.yarnpkg.com/xpath/-/xpath-0.0.27.tgz#dd3421fbdcc5646ac32c48531b4d7e9d0c2cfa92" - integrity sha512-fg03WRxtkCV6ohClePNAECYsmpKKTv5L8y/X3Dn1hQrec3POx2jHZ/0P2qQ6HvsrU1BmeqXcof3NGGueG6LxwQ== - -xtend@~4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" - integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== - -"y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4" - integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ== - -yallist@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" - integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= - -yallist@^3.0.2: - version "3.1.1" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" - integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== - -yallist@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" - integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== - -yaml@^1.9.2: - version "1.10.0" - resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e" - integrity sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg== - -yargs-parser@^11.1.1: - version "11.1.1" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4" - integrity sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ== - dependencies: - camelcase "^5.0.0" - decamelize "^1.2.0" - -yargs-parser@^13.1.2: - version "13.1.2" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38" - integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg== - dependencies: - camelcase "^5.0.0" - decamelize "^1.2.0" - -yargs-parser@^15.0.0: - version "15.0.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-15.0.0.tgz#cdd7a97490ec836195f59f3f4dbe5ea9e8f75f08" - integrity sha512-xLTUnCMc4JhxrPEPUYD5IBR1mWCK/aT6+RJ/K29JY2y1vD+FhtgKK0AXRWvI262q3QSffAQuTouFIKUuHX89wQ== - dependencies: - camelcase "^5.0.0" - decamelize "^1.2.0" - -yargs@^12.0.2: - version "12.0.5" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13" - integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw== - dependencies: - 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" - -yargs@^13.3.2: - version "13.3.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd" - integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw== - dependencies: - cliui "^5.0.0" - find-up "^3.0.0" - get-caller-file "^2.0.1" - require-directory "^2.1.1" - require-main-filename "^2.0.0" - set-blocking "^2.0.0" - string-width "^3.0.0" - which-module "^2.0.0" - y18n "^4.0.0" - yargs-parser "^13.1.2" - -yargs@^14.2: - version "14.2.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-14.2.2.tgz#2769564379009ff8597cdd38fba09da9b493c4b5" - integrity sha512-/4ld+4VV5RnrynMhPZJ/ZpOCGSCeghMykZ3BhdFBDa9Wy/RH6uEGNWDJog+aUlq+9OM1CFTgtYRW5Is1Po9NOA== - dependencies: - cliui "^5.0.0" - decamelize "^1.2.0" - find-up "^3.0.0" - get-caller-file "^2.0.1" - require-directory "^2.1.1" - require-main-filename "^2.0.0" - set-blocking "^2.0.0" - string-width "^3.0.0" - which-module "^2.0.0" - y18n "^4.0.0" - yargs-parser "^15.0.0" - -yauzl@^2.10.0: - version "2.10.0" - resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" - integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk= - dependencies: - buffer-crc32 "~0.2.3" - fd-slicer "~1.1.0" - -yeast@0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" - integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk= + "async" "^3.1.0" + "is-stream" "^2.0.0" + "logform" "^2.2.0" + "one-time" "^1.0.0" + "readable-stream" "^3.4.0" + "stack-trace" "0.0.x" + "triple-beam" "^1.3.0" + "winston-transport" "^4.4.0" + +"wrap-ansi@^2.0.0": + "integrity" "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=" + "resolved" "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz" + "version" "2.1.0" + dependencies: + "string-width" "^1.0.1" + "strip-ansi" "^3.0.1" + +"wrap-ansi@^5.1.0": + "integrity" "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==" + "resolved" "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz" + "version" "5.1.0" + dependencies: + "ansi-styles" "^3.2.0" + "string-width" "^3.0.0" + "strip-ansi" "^5.0.0" + +"wrappy@1": + "integrity" "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + "resolved" "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" + "version" "1.0.2" + +"write-file-atomic@^3.0.0": + "integrity" "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==" + "resolved" "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz" + "version" "3.0.3" + dependencies: + "imurmurhash" "^0.1.4" + "is-typedarray" "^1.0.0" + "signal-exit" "^3.0.2" + "typedarray-to-buffer" "^3.1.5" + +"ws@~7.4.2": + "integrity" "sha512-T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA==" + "resolved" "https://registry.npmjs.org/ws/-/ws-7.4.2.tgz" + "version" "7.4.2" + +"xdg-basedir@^4.0.0": + "integrity" "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==" + "resolved" "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz" + "version" "4.0.0" + +"xml-js@^1.6.11": + "integrity" "sha512-7rVi2KMfwfWFl+GpPg6m80IVMWXLRjO+PxTq7V2CDhoGak0wzYzFgUY2m4XJ47OGdXd8eLE8EmwfAmdjw7lC1g==" + "resolved" "https://registry.npmjs.org/xml-js/-/xml-js-1.6.11.tgz" + "version" "1.6.11" + dependencies: + "sax" "^1.2.4" + +"xml2js@^0.4.17", "xml2js@0.4.23": + "integrity" "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==" + "resolved" "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz" + "version" "0.4.23" + dependencies: + "sax" ">=0.6.0" + "xmlbuilder" "~11.0.0" + +"xmlbuilder@~11.0.0": + "integrity" "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==" + "resolved" "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz" + "version" "11.0.1" + +"xmldom@0.1.27": + "integrity" "sha1-1QH5ezvbQDr4757MIFcxh6rawOk=" + "resolved" "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz" + "version" "0.1.27" + +"xmlhttprequest-ssl@~1.5.4": + "integrity" "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=" + "resolved" "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz" + "version" "1.5.5" + +"xpath@^0.0.27": + "integrity" "sha512-fg03WRxtkCV6ohClePNAECYsmpKKTv5L8y/X3Dn1hQrec3POx2jHZ/0P2qQ6HvsrU1BmeqXcof3NGGueG6LxwQ==" + "resolved" "https://registry.npmjs.org/xpath/-/xpath-0.0.27.tgz" + "version" "0.0.27" + +"xtend@~4.0.1": + "integrity" "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==" + "resolved" "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz" + "version" "4.0.2" + +"y18n@^3.2.1 || ^4.0.0", "y18n@^4.0.0": + "integrity" "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==" + "resolved" "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz" + "version" "4.0.1" + +"yallist@^2.1.2": + "integrity" "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" + "resolved" "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz" + "version" "2.1.2" + +"yallist@^3.0.2": + "integrity" "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" + "resolved" "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz" + "version" "3.1.1" + +"yallist@^4.0.0": + "integrity" "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + "resolved" "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz" + "version" "4.0.0" + +"yaml@^1.9.2": + "integrity" "sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==" + "resolved" "https://registry.npmjs.org/yaml/-/yaml-1.10.0.tgz" + "version" "1.10.0" + +"yargs-parser@^11.1.1": + "integrity" "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==" + "resolved" "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz" + "version" "11.1.1" + dependencies: + "camelcase" "^5.0.0" + "decamelize" "^1.2.0" + +"yargs-parser@^13.1.2": + "integrity" "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==" + "resolved" "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz" + "version" "13.1.2" + dependencies: + "camelcase" "^5.0.0" + "decamelize" "^1.2.0" + +"yargs-parser@^15.0.0": + "integrity" "sha512-0OAMV2mAZQrs3FkNpDQcBk1x5HXb8X4twADss4S0Iuk+2dGnLOE/fRHrsYm542GduMveyA77OF4wrNJuanRCWw==" + "resolved" "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.1.tgz" + "version" "15.0.1" + dependencies: + "camelcase" "^5.0.0" + "decamelize" "^1.2.0" + +"yargs@^12.0.2": + "integrity" "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==" + "resolved" "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz" + "version" "12.0.5" + dependencies: + "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" + +"yargs@^13.3.2": + "integrity" "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==" + "resolved" "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz" + "version" "13.3.2" + dependencies: + "cliui" "^5.0.0" + "find-up" "^3.0.0" + "get-caller-file" "^2.0.1" + "require-directory" "^2.1.1" + "require-main-filename" "^2.0.0" + "set-blocking" "^2.0.0" + "string-width" "^3.0.0" + "which-module" "^2.0.0" + "y18n" "^4.0.0" + "yargs-parser" "^13.1.2" + +"yargs@^14.2": + "integrity" "sha512-/4ld+4VV5RnrynMhPZJ/ZpOCGSCeghMykZ3BhdFBDa9Wy/RH6uEGNWDJog+aUlq+9OM1CFTgtYRW5Is1Po9NOA==" + "resolved" "https://registry.npmjs.org/yargs/-/yargs-14.2.2.tgz" + "version" "14.2.2" + dependencies: + "cliui" "^5.0.0" + "decamelize" "^1.2.0" + "find-up" "^3.0.0" + "get-caller-file" "^2.0.1" + "require-directory" "^2.1.1" + "require-main-filename" "^2.0.0" + "set-blocking" "^2.0.0" + "string-width" "^3.0.0" + "which-module" "^2.0.0" + "y18n" "^4.0.0" + "yargs-parser" "^15.0.0" + +"yauzl@^2.10.0": + "integrity" "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=" + "resolved" "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz" + "version" "2.10.0" + dependencies: + "buffer-crc32" "~0.2.3" + "fd-slicer" "~1.1.0" + +"yeast@0.1.2": + "integrity" "sha1-AI4G2AlDIMNy28L47XagymyKxBk=" + "resolved" "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz" + "version" "0.1.2" From 73aef0613420c6079fcf5c402310918a80f6bbc7 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 5 May 2021 15:03:01 +0530 Subject: [PATCH 002/306] fix: Save sidebar after sorting --- .../internal_wiki_page/internal_wiki_page.py | 10 ++- frappe/public/js/frappe/views/wiki.js | 83 +++++++++++-------- 2 files changed, 56 insertions(+), 37 deletions(-) diff --git a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py index ea9a3a4dc5..9e291ed265 100644 --- a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py +++ b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py @@ -16,7 +16,7 @@ class InternalWikiPage(Document): self.sequence_id = frappe.get_last_doc('Internal Wiki Page').sequence_id + 1 @frappe.whitelist() -def save_wiki_page(title, parent, blocks, save=True): +def save_wiki_page(title, parent, sb_items, blocks, save=True): if save: if not frappe.db.exists("Workspace", title): wspace = frappe.new_doc('Workspace') @@ -32,7 +32,13 @@ def save_wiki_page(title, parent, blocks, save=True): doc = frappe.get_doc('Internal Wiki Page', title) doc.content = blocks doc.save() - + + if json.loads(sb_items): + for d in json.loads(sb_items): + doc = frappe.get_doc('Internal Wiki Page', d.get('name')) + doc.sequence_id = d.get('sequence_id') + doc.save() + return doc.title @frappe.whitelist() diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index df62fe2039..dcfa840997 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -11,7 +11,7 @@ frappe.views.Wiki = class Wiki { this.pages = {}; this.sections = {}; this.sidebar_items = {}; - this.sorted_sidebar_items = {} + this.sorted_sidebar_items = []; this.tools = {} this.isReadOnly = true; this.prepare_container(); @@ -26,7 +26,6 @@ frappe.views.Wiki = class Wiki { `).appendTo(this.wrapper.find(".layout-side-section")); this.sidebar = list_sidebar.find(".desk-sidebar"); this.body = this.wrapper.find(".layout-main-section"); - // this.body.addClass("frappe-card"); } setup_wiki_pages() { @@ -39,31 +38,10 @@ frappe.views.Wiki = class Wiki { } frappe.router.route(); this.make_sidebar(root_pages); - this.make_sidebar_sortable(); } }) } - make_sidebar_sortable() { - let me = this; - this.sidebar_sortable = Sortable.create(this.page.sidebar.find(".standard-sidebar-section").get(0), { - handle: ".standard-sidebar-item-container", - draggable: ".standard-sidebar-item-container", - animation: 150, - onEnd: function (evt){ - // let sb_items = me.all_pages.filter(page => page.parent_page == '' || page.parent_page == null) - // let startBlock = sb_items[evt.oldIndex]; - // let endBlock = sb_items[evt.newIndex]; - // startBlock.sequence_id = parseInt(me.sidebar.find('.standard-sidebar-item-container')[evt.oldIndex].getAttribute('item-sequence')); - // let oldName = me.sidebar.find('.standard-sidebar-item-container')[evt.oldIndex].getAttribute('item-name'); - // endBlock.sequence_id = parseInt(me.sidebar.find('.standard-sidebar-item-container')[evt.newIndex].getAttribute('item-sequence')); - // let newName = me.sidebar.find('.standard-sidebar-item-container')[evt.newIndex].getAttribute('item-name'); - // frappe.db.set_value('Internal Wiki Page', newName, {["sequence_id"]: startBlock.sequence_id}) - // frappe.db.set_value('Internal Wiki Page', oldName, {["sequence_id"]: endBlock.sequence_id}) - } - }); - } - get_pages() { return frappe.xcall("frappe.desk.doctype.internal_wiki_page.internal_wiki_page.get_pages").then(data => { this.all_pages = data; @@ -235,7 +213,7 @@ frappe.views.Wiki = class Wiki { } else if (this.all_pages) { default_page = this.all_pages[0].name; } else { - default_page = "Home"; + default_page = "Build"; } let page = frappe.get_route()[1] || default_page; @@ -275,20 +253,11 @@ frappe.views.Wiki = class Wiki { this.editor.readOnly.toggle(); this.editor.isReady .then(() => { - let me = this; this.undo = new Undo({ editor: this.editor }); this.undo.initialize({blocks: JSON.parse(this.content)}); this.setup_customization_buttons(); - this.page_sortable = Sortable.create(this.page.main.find(".codex-editor__redactor").get(0), { - handle: ".ce-block", - animation: 150, - onEnd: function (evt){ - me.editor.blocks.move(evt.newIndex, evt.oldIndex); - }, - setData: function (dataTransfer, dragEl) { - //Do Nothing - } - }); + this.make_sidebar_sortable(); + this.make_blocks_sortable(); }) }, ); @@ -298,6 +267,46 @@ frappe.views.Wiki = class Wiki { }); } + make_sidebar_sortable() { + let me = this; + this.sidebar_sortable = Sortable.create(this.page.sidebar.find(".standard-sidebar-section").get(0), { + handle: ".standard-sidebar-item-container", + draggable: ".standard-sidebar-item-container", + animation: 150, + onEnd: function (evt){ + let new_sb_items = []; + let old_sb_items = me.all_pages.filter(page => page.parent_page == '' || page.parent_page == null) + for (let page of evt.srcElement.childNodes) { + new_sb_items.push({ + name: page.attributes['item-name'].value, + sequence_id: parseInt(page.attributes['item-sequence'].value) + }) + } + me.sorted_sidebar_items = []; + new_sb_items.forEach((old, index) => { + if (old.sequence_id != old_sb_items[index].sequence_id) { + old.sequence_id = old_sb_items[index].sequence_id; + me.sorted_sidebar_items.push(old); + } + }); + } + }); + } + + make_blocks_sortable() { + let me = this; + this.page_sortable = Sortable.create(this.page.main.find(".codex-editor__redactor").get(0), { + handle: ".ce-block", + animation: 150, + onEnd: function (evt){ + me.editor.blocks.move(evt.newIndex, evt.oldIndex); + }, + setData: function (dataTransfer, dragEl) { + //Do Nothing + } + }); + } + setup_customization_buttons() { this.page.clear_primary_action(); this.page.clear_secondary_action(); @@ -312,6 +321,7 @@ frappe.views.Wiki = class Wiki { this.editor.readOnly.toggle(); this.isReadOnly = true; this.page_sortable.option("disabled", true); + this.sidebar_sortable.option("disabled", true); }, null, __("Saving") @@ -325,6 +335,7 @@ frappe.views.Wiki = class Wiki { this.editor.readOnly.toggle(); this.isReadOnly = true; this.page_sortable.option("disabled", true); + this.sidebar_sortable.option("disabled", true); this.reload(); frappe.show_alert({ message: __("Customizations Discarded"), indicator: "info" }); } @@ -401,6 +412,7 @@ frappe.views.Wiki = class Wiki { args: { title: me.title, parent: me.parent || '', + sb_items: me.sorted_sidebar_items, blocks: JSON.stringify(outputData.blocks), save: save }, @@ -410,6 +422,7 @@ frappe.views.Wiki = class Wiki { frappe.show_alert({ message: __("Page Saved Successfully"), indicator: "green" }); me.title = ''; me.parent = ''; + me.sorted_sidebar_items = []; me.reload(); } } From 4b7a1488b5b465ce2a4ba9c67c9b01b461ba6342 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 11 May 2021 17:28:16 +0530 Subject: [PATCH 003/306] fix: Add New Shortcut --- frappe/desk/desktop.py | 50 ++++++++++++ frappe/public/js/frappe/views/wiki.js | 34 +++++++- .../public/js/frappe/widgets/widget_group.js | 4 - frappe/public/js/frappe/wiki_blocks/blank.js | 10 +-- frappe/public/js/frappe/wiki_blocks/card.js | 21 +++-- frappe/public/js/frappe/wiki_blocks/chart.js | 15 ++-- .../public/js/frappe/wiki_blocks/paragraph.js | 10 +-- .../public/js/frappe/wiki_blocks/shortcut.js | 77 ++++++++++++------- 8 files changed, 164 insertions(+), 57 deletions(-) diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index d1b5e27a2f..7f054d5c1f 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -537,6 +537,56 @@ def save_customization(page, config): return True +@frappe.whitelist() +def save_new_widget(page, new_widgets): + original_page = frappe.get_doc("Workspace", page) + widgets = _dict(loads(new_widgets)) + + if widgets.chart: + original_page.charts = new_widget(widgets.chart, "Workspace Chart", "charts") + if widgets.shortcut: + original_page.shortcuts.extend(new_widget(widgets.shortcut, "Workspace Shortcut", "shortcuts")) + if widgets.card: + original_page.build_links_table_from_cards(widgets.card) + + try: + original_page.save(ignore_permissions=True) + except (ValidationError, TypeError) as e: + # Create a json string to log + json_config = dumps(widgets, sort_keys=True, indent=4) + + # Error log body + log = \ + """ + page: {0} + config: {1} + exception: {2} + """.format(page, json_config, e) + frappe.log_error(log, _("Could not save customization")) + return False + + return True + +def new_widget(config, doctype, parentfield): + if not config: + return [] + prepare_widget_list = [] + for idx, widget in enumerate(config): + # Some cleanup + widget.pop("name", None) + + # New Doc + doc = frappe.new_doc(doctype) + doc.update(widget) + + # Manually Set IDX + doc.idx = idx + 1 + + # Set Parent Field + doc.parentfield = parentfield + + prepare_widget_list.append(doc) + return prepare_widget_list def prepare_widget(config, doctype, parentfield): """Create widget child table entries with parent details diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index dcfa840997..b1fe2dbdf5 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -14,6 +14,7 @@ frappe.views.Wiki = class Wiki { this.sorted_sidebar_items = []; this.tools = {} this.isReadOnly = true; + this.new_page = null; this.prepare_container(); this.setup_wiki_pages(); } @@ -39,6 +40,10 @@ frappe.views.Wiki = class Wiki { frappe.router.route(); this.make_sidebar(root_pages); } + if (this.new_page) { + frappe.set_route(`wiki/${frappe.router.slug(this.new_page)}`) + this.new_page = null; + } }) } @@ -258,6 +263,7 @@ frappe.views.Wiki = class Wiki { this.setup_customization_buttons(); this.make_sidebar_sortable(); this.make_blocks_sortable(); + // this.customize(); }) }, ); @@ -296,7 +302,8 @@ frappe.views.Wiki = class Wiki { make_blocks_sortable() { let me = this; this.page_sortable = Sortable.create(this.page.main.find(".codex-editor__redactor").get(0), { - handle: ".ce-block", + handle: ".drag-handle", + draggable: ".ce-block", animation: 150, onEnd: function (evt){ me.editor.blocks.move(evt.newIndex, evt.oldIndex); @@ -374,6 +381,8 @@ frappe.views.Wiki = class Wiki { this.isReadOnly = false; this.editor.readOnly.toggle(); } + this.make_sidebar_sortable(); + this.make_blocks_sortable(); this.dirty = false; }) } @@ -407,6 +416,17 @@ frappe.views.Wiki = class Wiki { } let me = this; this.editor.save().then((outputData) => { + let new_widgets = {}; + outputData.blocks.forEach(item => { + if (item.data.new) { + if (!new_widgets[item.type]) { + new_widgets[item.type] = [] + } + new_widgets[item.type].push(item.data.new); + delete item.data['new']; + } + }) + frappe.call({ method: "frappe.desk.doctype.internal_wiki_page.internal_wiki_page.save_wiki_page", args: { @@ -419,10 +439,22 @@ frappe.views.Wiki = class Wiki { callback: function(res) { frappe.dom.unfreeze(); if (res.message) { + let cur_page = res.message; + if (!$.isEmptyObject(new_widgets)) { + frappe.call('frappe.desk.desktop.save_new_widget', { + page: me.title, + new_widgets: new_widgets + }).then(res => { + if(res.message) { + me.reload(); + } + }); + } frappe.show_alert({ message: __("Page Saved Successfully"), indicator: "green" }); me.title = ''; me.parent = ''; me.sorted_sidebar_items = []; + me.new_page = cur_page; me.reload(); } } diff --git a/frappe/public/js/frappe/widgets/widget_group.js b/frappe/public/js/frappe/widgets/widget_group.js index d1a5e3013c..3d97a8f778 100644 --- a/frappe/public/js/frappe/widgets/widget_group.js +++ b/frappe/public/js/frappe/widgets/widget_group.js @@ -218,13 +218,9 @@ export class SingleWidgetGroup { } customize() { - // if (!this.hidden) this.widget_area.show(); this.widgets_list.forEach((wid) => { wid.customize(this.options); }); - - // this.options.allow_create && this.setup_new_widget(); - // this.options.allow_sorting && this.setup_sortable(); } } diff --git a/frappe/public/js/frappe/wiki_blocks/blank.js b/frappe/public/js/frappe/wiki_blocks/blank.js index fa1a950280..ae8a53fc33 100644 --- a/frappe/public/js/frappe/wiki_blocks/blank.js +++ b/frappe/public/js/frappe/wiki_blocks/blank.js @@ -15,11 +15,11 @@ export default class Blank { this.api = api; this.config = config; this.readOnly = readOnly; - this.col = this.data.col ? this.data.col : "12", - this.pt = this.data.pt ? this.data.pt : "0", - this.pr = this.data.pr ? this.data.pr : "0", - this.pb = this.data.pb ? this.data.pb : "0", - this.pl = this.data.pl ? this.data.pl : "0" + this.col = this.data.col ? this.data.col : "12"; + this.pt = this.data.pt ? this.data.pt : "0"; + this.pr = this.data.pr ? this.data.pr : "0"; + this.pb = this.data.pb ? this.data.pb : "0"; + this.pl = this.data.pl ? this.data.pl : "0"; } render() { diff --git a/frappe/public/js/frappe/wiki_blocks/card.js b/frappe/public/js/frappe/wiki_blocks/card.js index 12061e2d02..a859b04439 100644 --- a/frappe/public/js/frappe/wiki_blocks/card.js +++ b/frappe/public/js/frappe/wiki_blocks/card.js @@ -16,11 +16,12 @@ export default class Card { this.config = config; this.readOnly = readOnly; this.sections = {}; - this.col = this.data.col ? this.data.col : "12", - this.pt = this.data.pt ? this.data.pt : "0", - this.pr = this.data.pr ? this.data.pr : "0", - this.pb = this.data.pb ? this.data.pb : "0", - this.pl = this.data.pl ? this.data.pl : "0" + this.col = this.data.col ? this.data.col : "12"; + this.pt = this.data.pt ? this.data.pt : "0"; + this.pr = this.data.pr ? this.data.pr : "0"; + this.pb = this.data.pb ? this.data.pb : "0"; + this.pl = this.data.pl ? this.data.pl : "0"; + this.allow_customization = !this.readOnly; } render() { @@ -135,15 +136,16 @@ export default class Card { }); this.wrapper.innerHTML = ''; this.sections = {}; + card.in_customize_mode = !this.readOnly; let cards = new frappe.widget.SingleWidgetGroup({ container: this.wrapper, type: "links", columns: 3, options: { allow_sorting: this.allow_customization, - allow_create: false, - allow_delete: false, - allow_hiding: this.allow_customization, + allow_create: this.allow_customization, + allow_delete: this.allow_customization, + allow_hiding: false, allow_edit: false, }, widgets: card @@ -151,5 +153,8 @@ export default class Card { this.sections["cards"] = cards; this.wrapper.setAttribute("card_name", card_name); + if (!this.readOnly) { + this.sections["cards"].customize(); + } } } \ No newline at end of file diff --git a/frappe/public/js/frappe/wiki_blocks/chart.js b/frappe/public/js/frappe/wiki_blocks/chart.js index 054e8d1c12..f8c97852fa 100644 --- a/frappe/public/js/frappe/wiki_blocks/chart.js +++ b/frappe/public/js/frappe/wiki_blocks/chart.js @@ -16,11 +16,12 @@ export default class Chart { this.config = config; this.readOnly = readOnly; this.sections = {}; - this.col = this.data.col ? this.data.col : "12", - this.pt = this.data.pt ? this.data.pt : "0", - this.pr = this.data.pr ? this.data.pr : "0", - this.pb = this.data.pb ? this.data.pb : "0", - this.pl = this.data.pl ? this.data.pl : "0" + this.col = this.data.col ? this.data.col : "12"; + this.pt = this.data.pt ? this.data.pt : "0"; + this.pr = this.data.pr ? this.data.pr : "0"; + this.pb = this.data.pb ? this.data.pb : "0"; + this.pl = this.data.pl ? this.data.pl : "0"; + this.allow_customization = !this.readOnly; } render() { @@ -135,6 +136,7 @@ export default class Chart { }); this.wrapper.innerHTML = ''; this.sections = {}; + chart.in_customize_mode = !this.readOnly; this.sections["charts"] = new frappe.widget.SingleWidgetGroup({ container: this.wrapper, type: "chart", @@ -152,5 +154,8 @@ export default class Chart { widgets: chart }); this.wrapper.setAttribute("chart_name", chart_name) + if (!this.readOnly) { + this.sections["charts"].customize(); + } } } \ No newline at end of file diff --git a/frappe/public/js/frappe/wiki_blocks/paragraph.js b/frappe/public/js/frappe/wiki_blocks/paragraph.js index 0cab2b9373..570a04e661 100644 --- a/frappe/public/js/frappe/wiki_blocks/paragraph.js +++ b/frappe/public/js/frappe/wiki_blocks/paragraph.js @@ -23,11 +23,11 @@ export default class Paragraph { this._preserveBlank = config.preserveBlank !== undefined ? config.preserveBlank : false; this.data = data; - this.col = this.data.col ? this.data.col : "12", - this.pt = this.data.pt ? this.data.pt : "0", - this.pr = this.data.pr ? this.data.pr : "0", - this.pb = this.data.pb ? this.data.pb : "0", - this.pl = this.data.pl ? this.data.pl : "0" + this.col = this.data.col ? this.data.col : "12"; + this.pt = this.data.pt ? this.data.pt : "0"; + this.pr = this.data.pr ? this.data.pr : "0"; + this.pb = this.data.pb ? this.data.pb : "0"; + this.pl = this.data.pl ? this.data.pl : "0"; } onKeyUp(e) { diff --git a/frappe/public/js/frappe/wiki_blocks/shortcut.js b/frappe/public/js/frappe/wiki_blocks/shortcut.js index 0cb8de6ef8..1a3d2ae970 100644 --- a/frappe/public/js/frappe/wiki_blocks/shortcut.js +++ b/frappe/public/js/frappe/wiki_blocks/shortcut.js @@ -1,3 +1,4 @@ +import get_dialog_constructor from "../widgets/widget_dialog.js"; export default class Shortcut { static get toolbox() { return { @@ -15,28 +16,25 @@ export default class Shortcut { this.api = api; this.config = config; this.readOnly = readOnly; - this.sections = {}; - this.col = this.data.col ? this.data.col : "12", - this.pt = this.data.pt ? this.data.pt : "0", - this.pr = this.data.pr ? this.data.pr : "0", - this.pb = this.data.pb ? this.data.pb : "0", - this.pl = this.data.pl ? this.data.pl : "0" + this.col = this.data.col ? this.data.col : "12"; + this.pt = this.data.pt ? this.data.pt : "0"; + this.pr = this.data.pr ? this.data.pr : "0"; + this.pb = this.data.pb ? this.data.pb : "0"; + this.pl = this.data.pl ? this.data.pl : "0"; + this.allow_customization = !this.readOnly; + this.options = { + allow_sorting: this.allow_customization, + allow_create: this.allow_customization, + allow_delete: this.allow_customization, + allow_hiding: false, + allow_edit: true, + } } render() { - let me = this; this.wrapper = document.createElement('div'); - this._make_fieldgroup(this.wrapper, [{ - fieldtype: "Select", - label: "Shortcut Name", - fieldname: "shortcut_name", - options: this.config.page_data.shortcuts.items.map(({ label }) => label), - change: function() { - if (this.value) { - me._make_shortcuts(this.value); - } - } - }]); + this._new_shortcut(); + if (this.data && this.data.shortcut_name) { this._make_shortcuts(this.data.shortcut_name) } @@ -50,7 +48,8 @@ export default class Shortcut { pt: this._getPadding("t"), pr: this._getPadding("r"), pb: this._getPadding("b"), - pl: this._getPadding("l") + pl: this._getPadding("l"), + new: this.new_shortcut_widget } } @@ -63,6 +62,30 @@ export default class Shortcut { e.classList.add("pl-" + this.pl) } + _new_shortcut() { + const dialog_class = get_dialog_constructor('shortcut'); + this.dialog = new dialog_class({ + label: this.label, + type: 'shortcut', + primary_action: (widget) => { + widget.in_customize_mode = 1; + let wid = frappe.widget.make_widget({ + ...widget, + widget_type: 'shortcut', + container: this.wrapper, + options: this.options, + }); + wid.customize(this.options); + this.wrapper.setAttribute("shortcut_name", wid.label); + this.new_shortcut_widget = wid.get_config(); + }, + }); + + if (!this.readOnly && this.data && !this.data.shortcut_name) { + this.dialog.make(); + } + } + _getCol() { var e = 12, t = "col-12", @@ -134,20 +157,16 @@ export default class Shortcut { return obj.label == shortcut_name }); this.wrapper.innerHTML = ''; - this.sections = {}; - this.sections["shortcuts"] = new frappe.widget.SingleWidgetGroup({ + shortcut.in_customize_mode = !this.readOnly; + let shortcut_widget = new frappe.widget.SingleWidgetGroup({ container: this.wrapper, type: "shortcut", - columns: 3, - options: { - allow_sorting: this.allow_customization, - allow_create: this.allow_customization, - allow_delete: this.allow_customization, - allow_hiding: false, - allow_edit: true, - }, + options: this.options, widgets: shortcut }); this.wrapper.setAttribute("shortcut_name", shortcut_name); + if (!this.readOnly) { + shortcut_widget.customize(); + } } } \ No newline at end of file From 80db1a715a8de19fdcd65a0b5b33aa178d79253f Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 12 May 2021 13:23:47 +0530 Subject: [PATCH 004/306] fix: Add New Card --- frappe/desk/desktop.py | 4 +- frappe/desk/doctype/workspace/workspace.py | 29 ++++++ .../public/js/frappe/widgets/widget_dialog.js | 93 +++++++++++++++++++ frappe/public/js/frappe/wiki_blocks/card.js | 65 +++++++------ 4 files changed, 163 insertions(+), 28 deletions(-) diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index 7f054d5c1f..c096f50b78 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -543,11 +543,11 @@ def save_new_widget(page, new_widgets): widgets = _dict(loads(new_widgets)) if widgets.chart: - original_page.charts = new_widget(widgets.chart, "Workspace Chart", "charts") + original_page.charts.extend(new_widget(widgets.chart, "Workspace Chart", "charts")) if widgets.shortcut: original_page.shortcuts.extend(new_widget(widgets.shortcut, "Workspace Shortcut", "shortcuts")) if widgets.card: - original_page.build_links_table_from_cards(widgets.card) + original_page.build_links_table_from_card(widgets.card) try: original_page.save(ignore_permissions=True) diff --git a/frappe/desk/doctype/workspace/workspace.py b/frappe/desk/doctype/workspace/workspace.py index 0934138821..20c9240188 100644 --- a/frappe/desk/doctype/workspace/workspace.py +++ b/frappe/desk/doctype/workspace/workspace.py @@ -100,6 +100,35 @@ class Workspace(Document): "is_query_report": link.get('is_query_report') }) + def build_links_table_from_card(self, config): + # Empty links table + # self.links = [] + # order = config.get('order') + # widgets = config.get('widgets') + + for idx, card in enumerate(config): + # card = widgets[name].copy() + links = loads(card.get('links')) + + self.append('links', { + "label": card.get('label'), + "type": "Card Break", + "icon": card.get('icon'), + "hidden": card.get('hidden') or False + }) + + for link in links: + self.append('links', { + "label": link.get('label'), + "type": "Link", + "link_type": link.get('link_type'), + "link_to": link.get('link_to'), + "onboard": link.get('onboard'), + "only_for": link.get('only_for'), + "dependencies": link.get('dependencies'), + "is_query_report": link.get('is_query_report') + }) + def disable_saving_as_standard(): return frappe.flags.in_install or \ diff --git a/frappe/public/js/frappe/widgets/widget_dialog.js b/frappe/public/js/frappe/widgets/widget_dialog.js index eefb78c29a..5bcaaf9e3e 100644 --- a/frappe/public/js/frappe/widgets/widget_dialog.js +++ b/frappe/public/js/frappe/widgets/widget_dialog.js @@ -124,6 +124,98 @@ class ChartDialog extends WidgetDialog { } } +class CardDialog extends WidgetDialog { + constructor(opts) { + super(opts); + } + + get_fields() { + let me = this; + return [ + { + fieldtype: "Data", + fieldname: "label", + label: "Label", + }, + { + fieldname: 'links', + fieldtype: 'Table', + label: __('Card Links'), + editable_grid: 1, + data: this.data || [], + get_data: () => { + return this.data || []; + }, + fields: [ + { + fieldname: "label", + fieldtype: "Data", + in_list_view: 1, + label: "Label" + }, + { + fieldname: "icon", + fieldtype: "Data", + label: "Icon" + }, + { + fieldname: "link_type", + fieldtype: "Select", + in_list_view: 1, + label: "Link Type", + options: ["DocType", "Page", "Report"], + onchange: (e) => { + me.link_to = e.currentTarget.value; + } + }, + { + fieldname: "link_to", + fieldtype: "Dynamic Link", + in_list_view: 1, + label: "Link To", + options: "link_type", + get_options: () => { + return me.link_to; + } + }, + { + fieldname: "column_break_7", + fieldtype: "Column Break" + }, + { + fieldname: "dependencies", + fieldtype: "Data", + label: "Dependencies" + }, + { + fieldname: "only_for", + fieldtype: "Link", + label: "Only for ", + options: "Country" + }, + { + default: "0", + fieldname: "onboard", + fieldtype: "Check", + label: "Onboard" + }, + { + default: "0", + fieldname: "is_query_report", + fieldtype: "Check", + label: "Is Query Report" + } + ], + }, + ]; + } + + process_data(data) { + data.label = data.label ? data.label : data.chart_name; + return data; + } +} + class ShortcutDialog extends WidgetDialog { constructor(opts) { super(opts); @@ -437,6 +529,7 @@ export default function get_dialog_constructor(type) { chart: ChartDialog, shortcut: ShortcutDialog, number_card: NumberCardDialog, + card: CardDialog, }; return widget_map[type] || WidgetDialog; diff --git a/frappe/public/js/frappe/wiki_blocks/card.js b/frappe/public/js/frappe/wiki_blocks/card.js index a859b04439..cc79a57c3e 100644 --- a/frappe/public/js/frappe/wiki_blocks/card.js +++ b/frappe/public/js/frappe/wiki_blocks/card.js @@ -1,3 +1,4 @@ +import get_dialog_constructor from "../widgets/widget_dialog.js"; export default class Card { static get toolbox() { return { @@ -22,22 +23,19 @@ export default class Card { this.pb = this.data.pb ? this.data.pb : "0"; this.pl = this.data.pl ? this.data.pl : "0"; this.allow_customization = !this.readOnly; + this.options = { + allow_sorting: this.allow_customization, + allow_create: this.allow_customization, + allow_delete: this.allow_customization, + allow_hiding: false, + allow_edit: false, + } } render() { - let me = this; this.wrapper = document.createElement('div'); - this._make_fieldgroup(this.wrapper, [{ - fieldtype: "Select", - label: "Card Name", - fieldname: "card_name", - options: this.config.page_data.cards.items.map(({ label }) => label), - change: function() { - if (this.value) { - me._make_cards(this.value) - } - } - }]); + this._new_card(); + if (this.data && this.data.card_name) { this._make_cards(this.data.card_name) } @@ -51,7 +49,8 @@ export default class Card { pt: this._getPadding("t"), pr: this._getPadding("r"), pb: this._getPadding("b"), - pl: this._getPadding("l") + pl: this._getPadding("l"), + new: this.new_card_widget } } @@ -64,6 +63,30 @@ export default class Card { e.classList.add("pl-" + this.pl) } + _new_card() { + const dialog_class = get_dialog_constructor('card'); + this.dialog = new dialog_class({ + label: this.label, + type: 'card', + primary_action: (widget) => { + widget.in_customize_mode = 1; + let wid = frappe.widget.make_widget({ + ...widget, + widget_type: 'links', + container: this.wrapper, + options: this.options, + }); + wid.customize(this.options); + this.wrapper.setAttribute("card_name", wid.label); + this.new_card_widget = wid.get_config(); + }, + }); + + if (!this.readOnly && this.data && !this.data.card_name) { + this.dialog.make(); + } + } + _getCol() { var e = 12, t = "col-12", @@ -135,26 +158,16 @@ export default class Card { return obj.label == card_name }); this.wrapper.innerHTML = ''; - this.sections = {}; card.in_customize_mode = !this.readOnly; - let cards = new frappe.widget.SingleWidgetGroup({ + let card_widget = new frappe.widget.SingleWidgetGroup({ container: this.wrapper, type: "links", - columns: 3, - options: { - allow_sorting: this.allow_customization, - allow_create: this.allow_customization, - allow_delete: this.allow_customization, - allow_hiding: false, - allow_edit: false, - }, + options: this.options, widgets: card }); - - this.sections["cards"] = cards; this.wrapper.setAttribute("card_name", card_name); if (!this.readOnly) { - this.sections["cards"].customize(); + card_widget.customize(); } } } \ No newline at end of file From 2f89787fa96a8883ee056c90c0f539b7be7ab14e Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 12 May 2021 14:33:12 +0530 Subject: [PATCH 005/306] fix: sider fix --- .../internal_wiki_page/internal_wiki_page.py | 4 +- frappe/desk/page/wiki/wiki.js | 4 +- frappe/public/js/frappe/views/wiki.js | 77 ++++++++-------- frappe/public/js/frappe/wiki_blocks/blank.js | 34 +++---- frappe/public/js/frappe/wiki_blocks/blocks.js | 4 +- frappe/public/js/frappe/wiki_blocks/card.js | 40 ++++----- frappe/public/js/frappe/wiki_blocks/chart.js | 42 ++++----- .../public/js/frappe/wiki_blocks/paragraph.js | 48 +++++----- .../public/js/frappe/wiki_blocks/shortcut.js | 40 ++++----- .../js/frappe/wiki_blocks/spacing_tune.js | 88 +++++++++---------- frappe/public/scss/desk/wiki.scss | 49 +++++------ 11 files changed, 213 insertions(+), 217 deletions(-) diff --git a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py index 9e291ed265..6e695ef516 100644 --- a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py +++ b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py @@ -3,8 +3,8 @@ # For license information, please see license.txt from __future__ import unicode_literals -import frappe, json -from frappe import _ +import frappe +import json from frappe.model.document import Document class InternalWikiPage(Document): diff --git a/frappe/desk/page/wiki/wiki.js b/frappe/desk/page/wiki/wiki.js index 81ff2a7fa2..6ac8bc89cb 100644 --- a/frappe/desk/page/wiki/wiki.js +++ b/frappe/desk/page/wiki/wiki.js @@ -1,4 +1,4 @@ -frappe.provide('frappe.views') +frappe.provide('frappe.views'); frappe.pages['wiki'].on_page_load = function(wrapper) { frappe.ui.make_app_page({ @@ -12,4 +12,4 @@ frappe.pages['wiki'].on_page_load = function(wrapper) { $(wrapper).bind('show', function () { frappe.wiki.show(); }); -} +}; diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index b1fe2dbdf5..a7c41b66bc 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -12,7 +12,7 @@ frappe.views.Wiki = class Wiki { this.sections = {}; this.sidebar_items = {}; this.sorted_sidebar_items = []; - this.tools = {} + this.tools = {}; this.isReadOnly = true; this.new_page = null; this.prepare_container(); @@ -31,9 +31,9 @@ frappe.views.Wiki = class Wiki { setup_wiki_pages() { this.get_pages().then(() => { - if(this.all_pages) { + if (this.all_pages) { frappe.wiki_pages = {}; - let root_pages = this.all_pages.filter(page => page.parent_page == '' || page.parent_page == null) + let root_pages = this.all_pages.filter(page => page.parent_page == '' || page.parent_page == null); for (let page of this.all_pages || []) { frappe.wiki_pages[frappe.router.slug(page.name)] = page; } @@ -41,10 +41,10 @@ frappe.views.Wiki = class Wiki { this.make_sidebar(root_pages); } if (this.new_page) { - frappe.set_route(`wiki/${frappe.router.slug(this.new_page)}`) + frappe.set_route(`wiki/${frappe.router.slug(this.new_page)}`); this.new_page = null; } - }) + }); } get_pages() { @@ -55,7 +55,7 @@ frappe.views.Wiki = class Wiki { make_sidebar(items) { if (this.sidebar.find('.standard-sidebar-section')[0]) { - this.sidebar.find('.standard-sidebar-section')[0].remove() + this.sidebar.find('.standard-sidebar-section')[0].remove(); } let sidebar_section = $(`
`); @@ -95,25 +95,25 @@ frappe.views.Wiki = class Wiki { `); - } + }; const make_sidebar_child_item = item => { let $child_item = get_child_item(item); - $child_item.appendTo(child_item_section) + $child_item.appendTo(child_item_section); this.sidebar_items[item.name] = $child_item; - } + }; let $item = get_sidebar_item(item); let drop_icon = $item.find('.drop-icon').get(0); let child_item_section = $item.find('.sidebar-child-item').get(0); - if(this.all_pages.some(e => e.parent_page == item.name)) { + if (this.all_pages.some(e => e.parent_page == item.name)) { drop_icon.classList.remove('hidden'); drop_icon.addEventListener('click', () => { child_item_section.classList.toggle("hidden"); }); } - let child_items = this.all_pages.filter(page => page.parent_page == item.name) + let child_items = this.all_pages.filter(page => page.parent_page == item.name); child_items.forEach(item => make_sidebar_child_item(item)); $item.appendTo(sidebar_section); @@ -138,7 +138,7 @@ frappe.views.Wiki = class Wiki { this.show_page(page); this.get_content(page).then(() => { this.get_data(page).then(() => { - if(this.content){ + if (this.content) { this.tools = { header: { class: Header, @@ -176,22 +176,22 @@ frappe.views.Wiki = class Wiki { }, blank: frappe.wiki_block.blocks['blank'], spacingTune: frappe.wiki_block.tunes['spacing_tune'], - } - if(this.editor) { + }; + if (this.editor) { this.editor.isReady.then(() => { this.editor.configuration.tools.chart.config.page_data = this.page_data; this.editor.configuration.tools.shortcut.config.page_data = this.page_data; this.editor.configuration.tools.card.config.page_data = this.page_data; this.editor.render({ blocks: JSON.parse(this.content) || [] - }) - }) + }); + }); } else { this.initialize_editorjs(JSON.parse(this.content)); } } - }) - }) + }); + }); } get_content(page) { @@ -257,14 +257,14 @@ frappe.views.Wiki = class Wiki { this.isReadOnly = false; this.editor.readOnly.toggle(); this.editor.isReady - .then(() => { - this.undo = new Undo({ editor: this.editor }); - this.undo.initialize({blocks: JSON.parse(this.content)}); - this.setup_customization_buttons(); - this.make_sidebar_sortable(); - this.make_blocks_sortable(); - // this.customize(); - }) + .then(() => { + this.undo = new Undo({ editor: this.editor }); + this.undo.initialize({blocks: JSON.parse(this.content)}); + this.setup_customization_buttons(); + this.make_sidebar_sortable(); + this.make_blocks_sortable(); + // this.customize(); + }); }, ); @@ -279,14 +279,14 @@ frappe.views.Wiki = class Wiki { handle: ".standard-sidebar-item-container", draggable: ".standard-sidebar-item-container", animation: 150, - onEnd: function (evt){ + onEnd: function (evt) { let new_sb_items = []; - let old_sb_items = me.all_pages.filter(page => page.parent_page == '' || page.parent_page == null) + let old_sb_items = me.all_pages.filter(page => page.parent_page == '' || page.parent_page == null); for (let page of evt.srcElement.childNodes) { new_sb_items.push({ name: page.attributes['item-name'].value, sequence_id: parseInt(page.attributes['item-sequence'].value) - }) + }); } me.sorted_sidebar_items = []; new_sb_items.forEach((old, index) => { @@ -305,7 +305,7 @@ frappe.views.Wiki = class Wiki { handle: ".drag-handle", draggable: ".ce-block", animation: 150, - onEnd: function (evt){ + onEnd: function (evt) { me.editor.blocks.move(evt.newIndex, evt.oldIndex); }, setData: function (dataTransfer, dragEl) { @@ -377,14 +377,14 @@ frappe.views.Wiki = class Wiki { } ] }).then(() => { - if(this.editor.configuration.readOnly) { + if (this.editor.configuration.readOnly) { this.isReadOnly = false; this.editor.readOnly.toggle(); } this.make_sidebar_sortable(); this.make_blocks_sortable(); this.dirty = false; - }) + }); } }); d.show(); @@ -394,7 +394,7 @@ frappe.views.Wiki = class Wiki { this.dirty = false; const data = { blocks: blocks || [] - } + }; this.editor = new EditorJS({ tools: this.tools, autofocus: false, @@ -421,11 +421,11 @@ frappe.views.Wiki = class Wiki { if (item.data.new) { if (!new_widgets[item.type]) { new_widgets[item.type] = [] - } + }; new_widgets[item.type].push(item.data.new); delete item.data['new']; } - }) + }); frappe.call({ method: "frappe.desk.doctype.internal_wiki_page.internal_wiki_page.save_wiki_page", @@ -445,7 +445,7 @@ frappe.views.Wiki = class Wiki { page: me.title, new_widgets: new_widgets }).then(res => { - if(res.message) { + if (res.message) { me.reload(); } }); @@ -460,7 +460,8 @@ frappe.views.Wiki = class Wiki { } }); }).catch((error) => { - console.log('Saving failed: ', error); + error; + // console.log('Saving failed: ', error); }); } @@ -468,4 +469,4 @@ frappe.views.Wiki = class Wiki { this.setup_wiki_pages(); this.dirty = false; } -} +}; diff --git a/frappe/public/js/frappe/wiki_blocks/blank.js b/frappe/public/js/frappe/wiki_blocks/blank.js index ae8a53fc33..f32007de6c 100644 --- a/frappe/public/js/frappe/wiki_blocks/blank.js +++ b/frappe/public/js/frappe/wiki_blocks/blank.js @@ -10,7 +10,7 @@ export default class Blank { return true; } - constructor({data, api, config, readOnly}){ + constructor({data, api, config, readOnly}) { this.data = data; this.api = api; this.config = config; @@ -39,22 +39,22 @@ export default class Blank { pr: this._getPadding("r"), pb: this._getPadding("b"), pl: this._getPadding("l") - } + }; } rendered() { var e = this.wrapper.parentNode.parentNode; - e.classList.add("col-" + this.col) - e.classList.add("pt-" + this.pt) - e.classList.add("pr-" + this.pr) - e.classList.add("pb-" + this.pb) - e.classList.add("pl-" + this.pl) + e.classList.add("col-" + this.col); + e.classList.add("pt-" + this.pt); + e.classList.add("pr-" + this.pr); + e.classList.add("pb-" + this.pb); + e.classList.add("pl-" + this.pl); } _getCol() { - var e = 12, - t = "col-12", - n = this.wrapper.parentNode.parentNode, + var e = 12; + t = "col-12"; + n = this.wrapper.parentNode.parentNode; r = new RegExp(/\bcol-.+?\b/, "g"); if (n.className.match(r)) { n.classList.forEach(function (e) { @@ -67,13 +67,13 @@ export default class Blank { } _getPadding() { - var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l", - t = 0, - n = "p" + e + "-0", - r = this.wrapper.parentNode.parentNode, - a = new RegExp(/\pl-.+?\b/, "g"), - i = new RegExp(/\pr-.+?\b/, "g"), - o = new RegExp(/\pt-.+?\b/, "g"), + var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; + t = 0; + n = "p" + e + "-0"; + r = this.wrapper.parentNode.parentNode; + a = new RegExp(/\pl-.+?\b/, "g"); + i = new RegExp(/\pr-.+?\b/, "g"); + o = new RegExp(/\pt-.+?\b/, "g"); c = new RegExp(/\pb-.+?\b/, "g"); if ("l" == e) { if (r.className.match(a)) { diff --git a/frappe/public/js/frappe/wiki_blocks/blocks.js b/frappe/public/js/frappe/wiki_blocks/blocks.js index 1b556eeaee..239127a674 100644 --- a/frappe/public/js/frappe/wiki_blocks/blocks.js +++ b/frappe/public/js/frappe/wiki_blocks/blocks.js @@ -19,5 +19,5 @@ frappe.wiki_block.blocks = { }; frappe.wiki_block.tunes = { - spacing_tune : SpacingTune -} \ No newline at end of file + spacing_tune: SpacingTune +}; \ No newline at end of file diff --git a/frappe/public/js/frappe/wiki_blocks/card.js b/frappe/public/js/frappe/wiki_blocks/card.js index cc79a57c3e..dd457fea4c 100644 --- a/frappe/public/js/frappe/wiki_blocks/card.js +++ b/frappe/public/js/frappe/wiki_blocks/card.js @@ -11,7 +11,7 @@ export default class Card { return true; } - constructor({data, api, config, readOnly, block}){ + constructor({data, api, config, readOnly}) { this.data = data; this.api = api; this.config = config; @@ -29,7 +29,7 @@ export default class Card { allow_delete: this.allow_customization, allow_hiding: false, allow_edit: false, - } + }; } render() { @@ -37,7 +37,7 @@ export default class Card { this._new_card(); if (this.data && this.data.card_name) { - this._make_cards(this.data.card_name) + this._make_cards(this.data.card_name); } return this.wrapper; } @@ -51,16 +51,16 @@ export default class Card { pb: this._getPadding("b"), pl: this._getPadding("l"), new: this.new_card_widget - } + }; } rendered() { var e = this.wrapper.parentNode.parentNode; - e.classList.add("col-" + this.col) - e.classList.add("pt-" + this.pt) - e.classList.add("pr-" + this.pr) - e.classList.add("pb-" + this.pb) - e.classList.add("pl-" + this.pl) + e.classList.add("col-" + this.col); + e.classList.add("pt-" + this.pt); + e.classList.add("pr-" + this.pr); + e.classList.add("pb-" + this.pb); + e.classList.add("pl-" + this.pl); } _new_card() { @@ -88,9 +88,9 @@ export default class Card { } _getCol() { - var e = 12, - t = "col-12", - n = this.wrapper.parentNode.parentNode, + var e = 12; + t = "col-12"; + n = this.wrapper.parentNode.parentNode; r = new RegExp(/\bcol-.+?\b/, "g"); if (n.className.match(r)) { n.classList.forEach(function (e) { @@ -103,13 +103,13 @@ export default class Card { } _getPadding() { - var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l", - t = 0, - n = "p" + e + "-0", - r = this.wrapper.parentNode.parentNode, - a = new RegExp(/\pl-.+?\b/, "g"), - i = new RegExp(/\pr-.+?\b/, "g"), - o = new RegExp(/\pt-.+?\b/, "g"), + var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; + t = 0; + n = "p" + e + "-0"; + r = this.wrapper.parentNode.parentNode; + a = new RegExp(/\pl-.+?\b/, "g"); + i = new RegExp(/\pr-.+?\b/, "g"); + o = new RegExp(/\pt-.+?\b/, "g"); c = new RegExp(/\pb-.+?\b/, "g"); if ("l" == e) { if (r.className.match(a)) { @@ -155,7 +155,7 @@ export default class Card { _make_cards(card_name) { let card = this.config.page_data.cards.items.find(obj => { - return obj.label == card_name + return obj.label == card_name; }); this.wrapper.innerHTML = ''; card.in_customize_mode = !this.readOnly; diff --git a/frappe/public/js/frappe/wiki_blocks/chart.js b/frappe/public/js/frappe/wiki_blocks/chart.js index f8c97852fa..5acaa81627 100644 --- a/frappe/public/js/frappe/wiki_blocks/chart.js +++ b/frappe/public/js/frappe/wiki_blocks/chart.js @@ -10,7 +10,7 @@ export default class Chart { return true; } - constructor({data, api, config, readOnly}){ + constructor({data, api, config, readOnly}) { this.data = data; this.api = api; this.config = config; @@ -34,12 +34,12 @@ export default class Chart { options: this.config.page_data.charts.items.map(({ chart_name }) => chart_name), change: function() { if (this.value) { - me._make_charts(this.value) + me._make_charts(this.value); } } }]); if (this.data && this.data.chart_name) { - this._make_charts(this.data.chart_name) + this._make_charts(this.data.chart_name); } return this.wrapper; } @@ -52,22 +52,22 @@ export default class Chart { pr: this._getPadding("r"), pb: this._getPadding("b"), pl: this._getPadding("l") - } + }; } rendered() { var e = this.wrapper.parentNode.parentNode; - e.classList.add("col-" + this.col) - e.classList.add("pt-" + this.pt) - e.classList.add("pr-" + this.pr) - e.classList.add("pb-" + this.pb) - e.classList.add("pl-" + this.pl) + e.classList.add("col-" + this.col); + e.classList.add("pt-" + this.pt); + e.classList.add("pr-" + this.pr); + e.classList.add("pb-" + this.pb); + e.classList.add("pl-" + this.pl); } _getCol() { - var e = 12, - t = "col-12", - n = this.wrapper.parentNode.parentNode, + var e = 12; + t = "col-12"; + n = this.wrapper.parentNode.parentNode; r = new RegExp(/\bcol-.+?\b/, "g"); if (n.className.match(r)) { n.classList.forEach(function (e) { @@ -80,13 +80,13 @@ export default class Chart { } _getPadding() { - var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l", - t = 0, - n = "p" + e + "-0", - r = this.wrapper.parentNode.parentNode, - a = new RegExp(/\pl-.+?\b/, "g"), - i = new RegExp(/\pr-.+?\b/, "g"), - o = new RegExp(/\pt-.+?\b/, "g"), + var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; + t = 0; + n = "p" + e + "-0"; + r = this.wrapper.parentNode.parentNode; + a = new RegExp(/\pl-.+?\b/, "g"); + i = new RegExp(/\pr-.+?\b/, "g"); + o = new RegExp(/\pt-.+?\b/, "g"); c = new RegExp(/\pb-.+?\b/, "g"); if ("l" == e) { if (r.className.match(a)) { @@ -132,7 +132,7 @@ export default class Chart { _make_charts(chart_name) { let chart = this.config.page_data.charts.items.find(obj => { - return obj.chart_name == chart_name + return obj.chart_name == chart_name; }); this.wrapper.innerHTML = ''; this.sections = {}; @@ -153,7 +153,7 @@ export default class Chart { }, widgets: chart }); - this.wrapper.setAttribute("chart_name", chart_name) + this.wrapper.setAttribute("chart_name", chart_name); if (!this.readOnly) { this.sections["charts"].customize(); } diff --git a/frappe/public/js/frappe/wiki_blocks/paragraph.js b/frappe/public/js/frappe/wiki_blocks/paragraph.js index 570a04e661..affc2b436d 100644 --- a/frappe/public/js/frappe/wiki_blocks/paragraph.js +++ b/frappe/public/js/frappe/wiki_blocks/paragraph.js @@ -62,7 +62,7 @@ export default class Paragraph { merge(data) { let newData = { - text : this.data.text + data.text + text: this.data.text + data.text }; this.data = newData; @@ -70,7 +70,7 @@ export default class Paragraph { validate(savedData) { if (savedData.text.trim() === '' && !this._preserveBlank) { - return false; + return false; } return true; @@ -89,17 +89,17 @@ export default class Paragraph { rendered() { var e = this._element.parentNode.parentNode; - e.classList.add("col-" + this.col) - e.classList.add("pt-" + this.pt) - e.classList.add("pr-" + this.pr) - e.classList.add("pb-" + this.pb) - e.classList.add("pl-" + this.pl) + e.classList.add("col-" + this.col); + e.classList.add("pt-" + this.pt); + e.classList.add("pr-" + this.pr); + e.classList.add("pb-" + this.pb); + e.classList.add("pl-" + this.pl); } _getCol() { - var e = 12, - t = "col-12", - n = this._element.parentNode.parentNode, + var e = 12; + t = "col-12"; + n = this._element.parentNode.parentNode; r = new RegExp(/\bcol-.+?\b/, "g"); if (n.className.match(r)) { n.classList.forEach(function (e) { @@ -112,13 +112,13 @@ export default class Paragraph { } _getPadding() { - var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l", - t = 0, - n = "p" + e + "-0", - r = this._element.parentNode.parentNode, - a = new RegExp(/\pl-.+?\b/, "g"), - i = new RegExp(/\pr-.+?\b/, "g"), - o = new RegExp(/\pt-.+?\b/, "g"), + var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; + t = 0; + n = "p" + e + "-0"; + r = this._element.parentNode.parentNode; + a = new RegExp(/\pl-.+?\b/, "g"); + i = new RegExp(/\pr-.+?\b/, "g"); + o = new RegExp(/\pt-.+?\b/, "g"); c = new RegExp(/\pb-.+?\b/, "g"); if ("l" == e) { if (r.className.match(a)) { @@ -156,7 +156,7 @@ export default class Paragraph { onPaste(event) { const data = { - text: event.detail.data.innerHTML + text: event.detail.data.innerHTML }; this.data = data; @@ -164,16 +164,16 @@ export default class Paragraph { static get conversionConfig() { return { - export: 'text', // to convert Paragraph to other block, use 'text' property of saved data - import: 'text' // to covert other block's exported string to Paragraph, fill 'text' property of tool data + export: 'text', // to convert Paragraph to other block, use 'text' property of saved data + import: 'text' // to covert other block's exported string to Paragraph, fill 'text' property of tool data }; } static get sanitize() { return { - text: { - br: true, - } + text: { + br: true, + } }; } @@ -197,7 +197,7 @@ export default class Paragraph { static get pasteConfig() { return { - tags: [ 'P' ] + tags: [ 'P' ] }; } diff --git a/frappe/public/js/frappe/wiki_blocks/shortcut.js b/frappe/public/js/frappe/wiki_blocks/shortcut.js index 1a3d2ae970..7bcebb478a 100644 --- a/frappe/public/js/frappe/wiki_blocks/shortcut.js +++ b/frappe/public/js/frappe/wiki_blocks/shortcut.js @@ -11,7 +11,7 @@ export default class Shortcut { return true; } - constructor({data, api, config, readOnly}){ + constructor({data, api, config, readOnly}) { this.data = data; this.api = api; this.config = config; @@ -28,7 +28,7 @@ export default class Shortcut { allow_delete: this.allow_customization, allow_hiding: false, allow_edit: true, - } + }; } render() { @@ -36,7 +36,7 @@ export default class Shortcut { this._new_shortcut(); if (this.data && this.data.shortcut_name) { - this._make_shortcuts(this.data.shortcut_name) + this._make_shortcuts(this.data.shortcut_name); } return this.wrapper; } @@ -50,16 +50,16 @@ export default class Shortcut { pb: this._getPadding("b"), pl: this._getPadding("l"), new: this.new_shortcut_widget - } + }; } rendered() { var e = this.wrapper.parentNode.parentNode; - e.classList.add("col-" + this.col) - e.classList.add("pt-" + this.pt) - e.classList.add("pr-" + this.pr) - e.classList.add("pb-" + this.pb) - e.classList.add("pl-" + this.pl) + e.classList.add("col-" + this.col); + e.classList.add("pt-" + this.pt); + e.classList.add("pr-" + this.pr); + e.classList.add("pb-" + this.pb); + e.classList.add("pl-" + this.pl); } _new_shortcut() { @@ -87,9 +87,9 @@ export default class Shortcut { } _getCol() { - var e = 12, - t = "col-12", - n = this.wrapper.parentNode.parentNode, + var e = 12; + t = "col-12"; + n = this.wrapper.parentNode.parentNode; r = new RegExp(/\bcol-.+?\b/, "g"); if (n.className.match(r)) { n.classList.forEach(function (e) { @@ -102,13 +102,13 @@ export default class Shortcut { } _getPadding() { - var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l", - t = 0, - n = "p" + e + "-0", - r = this.wrapper.parentNode.parentNode, - a = new RegExp(/\pl-.+?\b/, "g"), - i = new RegExp(/\pr-.+?\b/, "g"), - o = new RegExp(/\pt-.+?\b/, "g"), + var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; + t = 0; + n = "p" + e + "-0"; + r = this.wrapper.parentNode.parentNode; + a = new RegExp(/\pl-.+?\b/, "g"); + i = new RegExp(/\pr-.+?\b/, "g"); + o = new RegExp(/\pt-.+?\b/, "g"); c = new RegExp(/\pb-.+?\b/, "g"); if ("l" == e) { if (r.className.match(a)) { @@ -154,7 +154,7 @@ export default class Shortcut { _make_shortcuts(shortcut_name) { let shortcut = this.config.page_data.shortcuts.items.find(obj => { - return obj.label == shortcut_name + return obj.label == shortcut_name; }); this.wrapper.innerHTML = ''; shortcut.in_customize_mode = !this.readOnly; diff --git a/frappe/public/js/frappe/wiki_blocks/spacing_tune.js b/frappe/public/js/frappe/wiki_blocks/spacing_tune.js index 494ba2e97a..ee76503097 100644 --- a/frappe/public/js/frappe/wiki_blocks/spacing_tune.js +++ b/frappe/public/js/frappe/wiki_blocks/spacing_tune.js @@ -71,7 +71,7 @@ export default class SpacingTune { } let currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); - if (!currentBlock){ + if (!currentBlock) { return; } @@ -82,13 +82,13 @@ export default class SpacingTune { let colClass = new RegExp(/\bcol-.+?\b/, 'g'); if (currentBlockElement.className.match(colClass)) { currentBlockElement.classList.forEach( cn => { - if(cn.match(colClass)){ + if (cn.match(colClass)) { className = cn; } }); let parts = className.split('-'); let width = parseInt(parts[1]); - if(width >= 2){ + if (width >= 2) { currentBlockElement.classList.remove('col-'+width); width = width - 1; currentBlockElement.classList.add('col-'+width); @@ -104,7 +104,7 @@ export default class SpacingTune { } const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); - if (!currentBlock){ + if (!currentBlock) { return; } @@ -115,23 +115,23 @@ export default class SpacingTune { const colClass = new RegExp(/\bcol-.+?\b/, 'g'); if (currentBlockElement.className.match(colClass)) { currentBlockElement.classList.forEach( cn => { - if(cn.match(colClass)){ - className = cn; - } + if (cn.match(colClass)) { + className = cn; + } }); let parts = className.split('-'); let width = parseInt(parts[1]); - if(width <= 11){ - currentBlockElement.classList.remove('col-'+width); - width = width + 1; + if (width <= 11) { + currentBlockElement.classList.remove('col-'+width); + width = width + 1; currentBlockElement.classList.add('col-'+width); - } + } } } showPadding(event, button) { let me = this; - if(button.classList.contains('cdx-settings-button--active')){ + if (button.classList.contains('cdx-settings-button--active')) { this.sidebar.remove(); button.classList.remove('cdx-settings-button--active'); } else { @@ -290,12 +290,12 @@ export default class SpacingTune { increasePaddingLeft(event, button) { const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); - if(currentBlockIndex < 0){ + if (currentBlockIndex < 0) { return; } const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); - if (!currentBlock){ + if (!currentBlock) { return; } @@ -306,13 +306,13 @@ export default class SpacingTune { const paddingClass = new RegExp(/\pl-.+?\b/, 'g'); if (currentBlockElement.className.match(paddingClass)) { currentBlockElement.classList.forEach( cn => { - if(cn.match(paddingClass)){ + if (cn.match(paddingClass)) { className = cn; } }); let parts = className.split('-'); let padding = parseInt(parts[1]); - if(padding <= 4){ + if (padding <= 4) { currentBlockElement.classList.remove('pl-'+padding); padding = padding + 1; currentBlockElement.classList.add('pl-'+padding); @@ -324,12 +324,12 @@ export default class SpacingTune { decreasePaddingLeft(event, button) { const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); - if(currentBlockIndex < 0){ + if (currentBlockIndex < 0) { return; } const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); - if (!currentBlock){ + if (!currentBlock) { return; } @@ -340,13 +340,13 @@ export default class SpacingTune { const paddingClass = new RegExp(/\pl-.+?\b/, 'g'); if (currentBlockElement.className.match(paddingClass)) { currentBlockElement.classList.forEach( cn => { - if(cn.match(paddingClass)){ + if (cn.match(paddingClass)) { className = cn; } }); let parts = className.split('-'); let padding = parseInt(parts[1]); - if(padding >= 1){ + if (padding >= 1) { currentBlockElement.classList.remove('pl-'+padding); padding = padding - 1; currentBlockElement.classList.add('pl-'+padding); @@ -357,12 +357,12 @@ export default class SpacingTune { increasePaddingRight(event, button) { const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); - if(currentBlockIndex < 0){ + if (currentBlockIndex < 0) { return; } const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); - if (!currentBlock){ + if (!currentBlock) { return; } @@ -373,13 +373,13 @@ export default class SpacingTune { const paddingClass = new RegExp(/\pr-.+?\b/, 'g'); if (currentBlockElement.className.match(paddingClass)) { currentBlockElement.classList.forEach( cn => { - if(cn.match(paddingClass)){ + if (cn.match(paddingClass)) { className = cn; } }); let parts = className.split('-'); let padding = parseInt(parts[1]); - if(padding <= 4){ + if (padding <= 4) { currentBlockElement.classList.remove('pr-'+padding); padding = padding + 1; currentBlockElement.classList.add('pr-'+padding); @@ -390,12 +390,12 @@ export default class SpacingTune { decreasePaddingRight(event, button) { const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); - if(currentBlockIndex < 0){ + if (currentBlockIndex < 0) { return; } const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); - if (!currentBlock){ + if (!currentBlock) { return; } @@ -406,13 +406,13 @@ export default class SpacingTune { const paddingClass = new RegExp(/\pr-.+?\b/, 'g'); if (currentBlockElement.className.match(paddingClass)) { currentBlockElement.classList.forEach( cn => { - if(cn.match(paddingClass)){ + if (cn.match(paddingClass)) { className = cn; } }); let parts = className.split('-'); let padding = parseInt(parts[1]); - if(padding >= 1){ + if (padding >= 1) { currentBlockElement.classList.remove('pr-'+padding); padding = padding - 1; currentBlockElement.classList.add('pr-'+padding); @@ -423,12 +423,12 @@ export default class SpacingTune { increasePaddingTop(event, button) { const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); - if(currentBlockIndex < 0){ + if (currentBlockIndex < 0) { return; } const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); - if (!currentBlock){ + if (!currentBlock) { return; } @@ -439,13 +439,13 @@ export default class SpacingTune { const paddingClass = new RegExp(/\pt-.+?\b/, 'g'); if (currentBlockElement.className.match(paddingClass)) { currentBlockElement.classList.forEach( cn => { - if(cn.match(paddingClass)){ + if (cn.match(paddingClass)) { className = cn; } }); let parts = className.split('-'); let padding = parseInt(parts[1]); - if(padding <= 4){ + if (padding <= 4) { currentBlockElement.classList.remove('pt-'+padding); padding = padding + 1; currentBlockElement.classList.add('pt-'+padding); @@ -456,12 +456,12 @@ export default class SpacingTune { decreasePaddingTop(event, button) { const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); - if(currentBlockIndex < 0){ + if (currentBlockIndex < 0) { return; } const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); - if (!currentBlock){ + if (!currentBlock) { return; } @@ -472,13 +472,13 @@ export default class SpacingTune { const paddingClass = new RegExp(/\pt-.+?\b/, 'g'); if (currentBlockElement.className.match(paddingClass)) { currentBlockElement.classList.forEach( cn => { - if(cn.match(paddingClass)){ + if (cn.match(paddingClass)) { className = cn; } }); let parts = className.split('-'); let padding = parseInt(parts[1]); - if(padding >= 1){ + if (padding >= 1) { currentBlockElement.classList.remove('pt-'+padding); padding = padding - 1; currentBlockElement.classList.add('pt-'+padding); @@ -489,12 +489,12 @@ export default class SpacingTune { increasePaddingBottom(event, button) { const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); - if(currentBlockIndex < 0){ + if (currentBlockIndex < 0) { return; } const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); - if (!currentBlock){ + if (!currentBlock) { return; } @@ -505,13 +505,13 @@ export default class SpacingTune { const paddingClass = new RegExp(/\pb-.+?\b/, 'g'); if (currentBlockElement.className.match(paddingClass)) { currentBlockElement.classList.forEach( cn => { - if(cn.match(paddingClass)){ + if (cn.match(paddingClass)) { className = cn; } }); let parts = className.split('-'); let padding = parseInt(parts[1]); - if(padding <= 4){ + if (padding <= 4) { currentBlockElement.classList.remove('pb-'+padding); padding = padding + 1; currentBlockElement.classList.add('pb-'+padding); @@ -522,12 +522,12 @@ export default class SpacingTune { decreasePaddingBottom(event, button) { const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); - if(currentBlockIndex < 0){ + if (currentBlockIndex < 0) { return; } const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); - if (!currentBlock){ + if (!currentBlock) { return; } @@ -538,13 +538,13 @@ export default class SpacingTune { const paddingClass = new RegExp(/\pb-.+?\b/, 'g'); if (currentBlockElement.className.match(paddingClass)) { currentBlockElement.classList.forEach( cn => { - if(cn.match(paddingClass)){ + if (cn.match(paddingClass)) { className = cn; } }); let parts = className.split('-'); let padding = parseInt(parts[1]); - if(padding >= 1){ + if (padding >= 1) { currentBlockElement.classList.remove('pb-'+padding); padding = padding - 1; currentBlockElement.classList.add('pb-'+padding); diff --git a/frappe/public/scss/desk/wiki.scss b/frappe/public/scss/desk/wiki.scss index a04fb1e501..8c464a7a48 100644 --- a/frappe/public/scss/desk/wiki.scss +++ b/frappe/public/scss/desk/wiki.scss @@ -11,6 +11,28 @@ } } } + + .standard-sidebar-item { + justify-content: space-between; + } + + .sidebar-child-item-container { + margin-left: 10px; + + .standard-sidebar-item { + justify-content: start; + } + } + + .sidebar-item-label { + flex: 1; + } + + .item-anchor { + display: flex; + overflow: hidden; + flex: 1; + } } .ce-header { @@ -124,31 +146,4 @@ height: 145px; box-shadow: 0 3px 15px -3px rgba(13,20,33,.13); border-radius: 0 4px 4px 0;z-index: 0; -} - - -[data-page-route="wiki"] { - - .standard-sidebar-item { - justify-content: space-between; - } - - .sidebar-child-item-container { - margin-left: 10px; - - .standard-sidebar-item { - justify-content: start; - } - } - - .sidebar-item-label { - flex: 1; - } - - .item-anchor { - display: flex; - overflow: hidden; - flex: 1; - } - } \ No newline at end of file From 85f849d3e9d7303815a760a2296bf2374098e738 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 12 May 2021 14:39:11 +0530 Subject: [PATCH 006/306] fix: sider fix --- frappe/public/js/frappe/wiki_blocks/blank.js | 20 +++++++++---------- frappe/public/js/frappe/wiki_blocks/card.js | 20 +++++++++---------- frappe/public/js/frappe/wiki_blocks/chart.js | 20 +++++++++---------- .../public/js/frappe/wiki_blocks/paragraph.js | 20 +++++++++---------- .../public/js/frappe/wiki_blocks/shortcut.js | 20 +++++++++---------- 5 files changed, 50 insertions(+), 50 deletions(-) diff --git a/frappe/public/js/frappe/wiki_blocks/blank.js b/frappe/public/js/frappe/wiki_blocks/blank.js index f32007de6c..f23f2f6225 100644 --- a/frappe/public/js/frappe/wiki_blocks/blank.js +++ b/frappe/public/js/frappe/wiki_blocks/blank.js @@ -53,9 +53,9 @@ export default class Blank { _getCol() { var e = 12; - t = "col-12"; - n = this.wrapper.parentNode.parentNode; - r = new RegExp(/\bcol-.+?\b/, "g"); + var t = "col-12"; + var n = this.wrapper.parentNode.parentNode; + var r = new RegExp(/\bcol-.+?\b/, "g"); if (n.className.match(r)) { n.classList.forEach(function (e) { e.match(r) && (t = e); @@ -68,13 +68,13 @@ export default class Blank { _getPadding() { var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; - t = 0; - n = "p" + e + "-0"; - r = this.wrapper.parentNode.parentNode; - a = new RegExp(/\pl-.+?\b/, "g"); - i = new RegExp(/\pr-.+?\b/, "g"); - o = new RegExp(/\pt-.+?\b/, "g"); - c = new RegExp(/\pb-.+?\b/, "g"); + var t = 0; + var n = "p" + e + "-0"; + var r = this.wrapper.parentNode.parentNode; + var a = new RegExp(/\pl-.+?\b/, "g"); + var i = new RegExp(/\pr-.+?\b/, "g"); + var o = new RegExp(/\pt-.+?\b/, "g"); + var c = new RegExp(/\pb-.+?\b/, "g"); if ("l" == e) { if (r.className.match(a)) { r.classList.forEach(function (e) { diff --git a/frappe/public/js/frappe/wiki_blocks/card.js b/frappe/public/js/frappe/wiki_blocks/card.js index dd457fea4c..3e7fd54dfd 100644 --- a/frappe/public/js/frappe/wiki_blocks/card.js +++ b/frappe/public/js/frappe/wiki_blocks/card.js @@ -89,9 +89,9 @@ export default class Card { _getCol() { var e = 12; - t = "col-12"; - n = this.wrapper.parentNode.parentNode; - r = new RegExp(/\bcol-.+?\b/, "g"); + var t = "col-12"; + var n = this.wrapper.parentNode.parentNode; + var r = new RegExp(/\bcol-.+?\b/, "g"); if (n.className.match(r)) { n.classList.forEach(function (e) { e.match(r) && (t = e); @@ -104,13 +104,13 @@ export default class Card { _getPadding() { var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; - t = 0; - n = "p" + e + "-0"; - r = this.wrapper.parentNode.parentNode; - a = new RegExp(/\pl-.+?\b/, "g"); - i = new RegExp(/\pr-.+?\b/, "g"); - o = new RegExp(/\pt-.+?\b/, "g"); - c = new RegExp(/\pb-.+?\b/, "g"); + var t = 0; + var n = "p" + e + "-0"; + var r = this.wrapper.parentNode.parentNode; + var a = new RegExp(/\pl-.+?\b/, "g"); + var i = new RegExp(/\pr-.+?\b/, "g"); + var o = new RegExp(/\pt-.+?\b/, "g"); + var c = new RegExp(/\pb-.+?\b/, "g"); if ("l" == e) { if (r.className.match(a)) { r.classList.forEach(function (e) { diff --git a/frappe/public/js/frappe/wiki_blocks/chart.js b/frappe/public/js/frappe/wiki_blocks/chart.js index 5acaa81627..1d637ef5b6 100644 --- a/frappe/public/js/frappe/wiki_blocks/chart.js +++ b/frappe/public/js/frappe/wiki_blocks/chart.js @@ -66,9 +66,9 @@ export default class Chart { _getCol() { var e = 12; - t = "col-12"; - n = this.wrapper.parentNode.parentNode; - r = new RegExp(/\bcol-.+?\b/, "g"); + var t = "col-12"; + var n = this.wrapper.parentNode.parentNode; + var r = new RegExp(/\bcol-.+?\b/, "g"); if (n.className.match(r)) { n.classList.forEach(function (e) { e.match(r) && (t = e); @@ -81,13 +81,13 @@ export default class Chart { _getPadding() { var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; - t = 0; - n = "p" + e + "-0"; - r = this.wrapper.parentNode.parentNode; - a = new RegExp(/\pl-.+?\b/, "g"); - i = new RegExp(/\pr-.+?\b/, "g"); - o = new RegExp(/\pt-.+?\b/, "g"); - c = new RegExp(/\pb-.+?\b/, "g"); + var t = 0; + var n = "p" + e + "-0"; + var r = this.wrapper.parentNode.parentNode; + var a = new RegExp(/\pl-.+?\b/, "g"); + var i = new RegExp(/\pr-.+?\b/, "g"); + var o = new RegExp(/\pt-.+?\b/, "g"); + var c = new RegExp(/\pb-.+?\b/, "g"); if ("l" == e) { if (r.className.match(a)) { r.classList.forEach(function (e) { diff --git a/frappe/public/js/frappe/wiki_blocks/paragraph.js b/frappe/public/js/frappe/wiki_blocks/paragraph.js index affc2b436d..e80d300ec3 100644 --- a/frappe/public/js/frappe/wiki_blocks/paragraph.js +++ b/frappe/public/js/frappe/wiki_blocks/paragraph.js @@ -98,9 +98,9 @@ export default class Paragraph { _getCol() { var e = 12; - t = "col-12"; - n = this._element.parentNode.parentNode; - r = new RegExp(/\bcol-.+?\b/, "g"); + var t = "col-12"; + var n = this._element.parentNode.parentNode; + var r = new RegExp(/\bcol-.+?\b/, "g"); if (n.className.match(r)) { n.classList.forEach(function (e) { e.match(r) && (t = e); @@ -113,13 +113,13 @@ export default class Paragraph { _getPadding() { var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; - t = 0; - n = "p" + e + "-0"; - r = this._element.parentNode.parentNode; - a = new RegExp(/\pl-.+?\b/, "g"); - i = new RegExp(/\pr-.+?\b/, "g"); - o = new RegExp(/\pt-.+?\b/, "g"); - c = new RegExp(/\pb-.+?\b/, "g"); + var t = 0; + var n = "p" + e + "-0"; + var r = this._element.parentNode.parentNode; + var a = new RegExp(/\pl-.+?\b/, "g"); + var i = new RegExp(/\pr-.+?\b/, "g"); + var o = new RegExp(/\pt-.+?\b/, "g"); + var c = new RegExp(/\pb-.+?\b/, "g"); if ("l" == e) { if (r.className.match(a)) { r.classList.forEach(function (e) { diff --git a/frappe/public/js/frappe/wiki_blocks/shortcut.js b/frappe/public/js/frappe/wiki_blocks/shortcut.js index 7bcebb478a..53b5a5eed5 100644 --- a/frappe/public/js/frappe/wiki_blocks/shortcut.js +++ b/frappe/public/js/frappe/wiki_blocks/shortcut.js @@ -88,9 +88,9 @@ export default class Shortcut { _getCol() { var e = 12; - t = "col-12"; - n = this.wrapper.parentNode.parentNode; - r = new RegExp(/\bcol-.+?\b/, "g"); + var t = "col-12"; + var n = this.wrapper.parentNode.parentNode; + var r = new RegExp(/\bcol-.+?\b/, "g"); if (n.className.match(r)) { n.classList.forEach(function (e) { e.match(r) && (t = e); @@ -103,13 +103,13 @@ export default class Shortcut { _getPadding() { var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; - t = 0; - n = "p" + e + "-0"; - r = this.wrapper.parentNode.parentNode; - a = new RegExp(/\pl-.+?\b/, "g"); - i = new RegExp(/\pr-.+?\b/, "g"); - o = new RegExp(/\pt-.+?\b/, "g"); - c = new RegExp(/\pb-.+?\b/, "g"); + var t = 0; + var n = "p" + e + "-0"; + var r = this.wrapper.parentNode.parentNode; + var a = new RegExp(/\pl-.+?\b/, "g"); + var i = new RegExp(/\pr-.+?\b/, "g"); + var o = new RegExp(/\pt-.+?\b/, "g"); + var c = new RegExp(/\pb-.+?\b/, "g"); if ("l" == e) { if (r.className.match(a)) { r.classList.forEach(function (e) { From 31e087d1a9b1f90a5bb9b737ca51f078e8dc3f58 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 12 May 2021 14:58:41 +0530 Subject: [PATCH 007/306] fix: sider fix --- frappe/public/js/frappe/views/wiki.js | 6 +-- frappe/public/js/frappe/wiki_blocks/blank.js | 2 +- .../js/frappe/wiki_blocks/spacing_tune.js | 44 +++++++++---------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index a7c41b66bc..ec4f2a49e8 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -308,7 +308,7 @@ frappe.views.Wiki = class Wiki { onEnd: function (evt) { me.editor.blocks.move(evt.newIndex, evt.oldIndex); }, - setData: function (dataTransfer, dragEl) { + setData: function () { //Do Nothing } }); @@ -420,8 +420,8 @@ frappe.views.Wiki = class Wiki { outputData.blocks.forEach(item => { if (item.data.new) { if (!new_widgets[item.type]) { - new_widgets[item.type] = [] - }; + new_widgets[item.type] = []; + } new_widgets[item.type].push(item.data.new); delete item.data['new']; } diff --git a/frappe/public/js/frappe/wiki_blocks/blank.js b/frappe/public/js/frappe/wiki_blocks/blank.js index f23f2f6225..761bd2d9e9 100644 --- a/frappe/public/js/frappe/wiki_blocks/blank.js +++ b/frappe/public/js/frappe/wiki_blocks/blank.js @@ -32,7 +32,7 @@ export default class Blank { return this.wrapper; } - save(blockContent) { + save() { return { col: this._getCol(), pt: this._getPadding("t"), diff --git a/frappe/public/js/frappe/wiki_blocks/spacing_tune.js b/frappe/public/js/frappe/wiki_blocks/spacing_tune.js index ee76503097..1cf6891071 100644 --- a/frappe/public/js/frappe/wiki_blocks/spacing_tune.js +++ b/frappe/public/js/frappe/wiki_blocks/spacing_tune.js @@ -37,7 +37,7 @@ export default class SpacingTune { this.api.listeners.on( paddingButton, 'click', - (event) => me.showPadding(event, paddingButton), + () => me.showPadding(paddingButton), false ); @@ -46,7 +46,7 @@ export default class SpacingTune { this.api.listeners.on( decreaseWidthButton, 'click', - (event) => me.decreaseWidth(event, decreaseWidthButton), + () => me.decreaseWidth(), false ); @@ -55,7 +55,7 @@ export default class SpacingTune { this.api.listeners.on( increaseWidthButton, 'click', - (event) => me.increaseWidth(event, increaseWidthButton), + () => me.increaseWidth(), false ); @@ -63,7 +63,7 @@ export default class SpacingTune { return layoutWrapper; } - decreaseWidth(event, button) { + decreaseWidth() { const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); if (currentBlockIndex < 0) { @@ -96,7 +96,7 @@ export default class SpacingTune { } } - increaseWidth(event, button) { + increaseWidth() { const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); if (currentBlockIndex < 0) { @@ -129,7 +129,7 @@ export default class SpacingTune { } } - showPadding(event, button) { + showPadding(button) { let me = this; if (button.classList.contains('cdx-settings-button--active')) { this.sidebar.remove(); @@ -195,7 +195,7 @@ export default class SpacingTune { this.api.listeners.on( increasePaddingLeft, 'click', - (event) => me.increasePaddingLeft(event, increasePaddingLeft), + () => me.increasePaddingLeft(), false ); sidebarWrapper.appendChild(increasePaddingLeft); @@ -206,7 +206,7 @@ export default class SpacingTune { this.api.listeners.on( decreasePaddingLeft, 'click', - (event) => me.decreasePaddingLeft(event, decreasePaddingLeft), + () => me.decreasePaddingLeft(), false ); sidebarWrapper.appendChild(decreasePaddingLeft); @@ -219,7 +219,7 @@ export default class SpacingTune { this.api.listeners.on( increasePaddingRight, 'click', - (event) => me.increasePaddingRight(event, increasePaddingRight), + () => me.increasePaddingRight(), false ); sidebarWrapper.appendChild(increasePaddingRight); @@ -230,7 +230,7 @@ export default class SpacingTune { this.api.listeners.on( decreasePaddingRight, 'click', - (event) => me.decreasePaddingRight(event, decreasePaddingRight), + () => me.decreasePaddingRight(), false ); sidebarWrapper.appendChild(decreasePaddingRight); @@ -243,7 +243,7 @@ export default class SpacingTune { this.api.listeners.on( increasePaddingTop, 'click', - (event) => me.increasePaddingTop(event, increasePaddingTop), + () => me.increasePaddingTop(), false ); sidebarWrapper.appendChild(increasePaddingTop); @@ -254,7 +254,7 @@ export default class SpacingTune { this.api.listeners.on( decreasePaddingTop, 'click', - (event) => me.decreasePaddingTop(event, decreasePaddingTop), + () => me.decreasePaddingTop(), false ); sidebarWrapper.appendChild(decreasePaddingTop); @@ -267,7 +267,7 @@ export default class SpacingTune { this.api.listeners.on( increasePaddingBottom, 'click', - (event) => me.increasePaddingBottom(event, increasePaddingBottom), + () => me.increasePaddingBottom(), false ); sidebarWrapper.appendChild(increasePaddingBottom); @@ -278,7 +278,7 @@ export default class SpacingTune { this.api.listeners.on( decreasePaddingBottom, 'click', - (event) => me.decreasePaddingBottom(event, decreasePaddingBottom), + () => me.decreasePaddingBottom(), false ); sidebarWrapper.appendChild(decreasePaddingBottom); @@ -287,7 +287,7 @@ export default class SpacingTune { } } - increasePaddingLeft(event, button) { + increasePaddingLeft() { const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); if (currentBlockIndex < 0) { @@ -321,7 +321,7 @@ export default class SpacingTune { } - decreasePaddingLeft(event, button) { + decreasePaddingLeft() { const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); if (currentBlockIndex < 0) { @@ -354,7 +354,7 @@ export default class SpacingTune { } } - increasePaddingRight(event, button) { + increasePaddingRight() { const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); if (currentBlockIndex < 0) { @@ -387,7 +387,7 @@ export default class SpacingTune { } } - decreasePaddingRight(event, button) { + decreasePaddingRight() { const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); if (currentBlockIndex < 0) { @@ -420,7 +420,7 @@ export default class SpacingTune { } } - increasePaddingTop(event, button) { + increasePaddingTop() { const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); if (currentBlockIndex < 0) { @@ -453,7 +453,7 @@ export default class SpacingTune { } } - decreasePaddingTop(event, button) { + decreasePaddingTop() { const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); if (currentBlockIndex < 0) { @@ -486,7 +486,7 @@ export default class SpacingTune { } } - increasePaddingBottom(event, button) { + increasePaddingBottom() { const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); if (currentBlockIndex < 0) { @@ -519,7 +519,7 @@ export default class SpacingTune { } } - decreasePaddingBottom(event, button) { + decreasePaddingBottom() { const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); if (currentBlockIndex < 0) { From 788c511274eda1e9ac452e739a83ecc16f4cdf98 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 12 May 2021 17:47:55 +0530 Subject: [PATCH 008/306] fix: Delete Card and Shortcut --- frappe/public/js/frappe/widgets/widget_group.js | 13 ++++++++----- frappe/public/js/frappe/wiki_blocks/card.js | 10 +++++++--- frappe/public/js/frappe/wiki_blocks/shortcut.js | 12 ++++++++---- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/frappe/public/js/frappe/widgets/widget_group.js b/frappe/public/js/frappe/widgets/widget_group.js index 3d97a8f778..2b85359330 100644 --- a/frappe/public/js/frappe/widgets/widget_group.js +++ b/frappe/public/js/frappe/widgets/widget_group.js @@ -205,18 +205,21 @@ export class SingleWidgetGroup { widget_type: this.type, container: this.container, height: this.height || null, - options: { - ...this.options, - on_delete: (name) => this.on_delete(name), - }, }); - + widget_object.options = { + ...this.options, + on_delete: (name) => this.on_delete(name) + }; this.widgets_list.push(widget_object); this.widgets_dict[widget.name] = widget_object; return widget_object; } + on_delete(name, setup_new) { + this.api.blocks.delete(); + } + customize() { this.widgets_list.forEach((wid) => { wid.customize(this.options); diff --git a/frappe/public/js/frappe/wiki_blocks/card.js b/frappe/public/js/frappe/wiki_blocks/card.js index 3e7fd54dfd..f06e4754e0 100644 --- a/frappe/public/js/frappe/wiki_blocks/card.js +++ b/frappe/public/js/frappe/wiki_blocks/card.js @@ -73,9 +73,12 @@ export default class Card { let wid = frappe.widget.make_widget({ ...widget, widget_type: 'links', - container: this.wrapper, - options: this.options, + container: this.wrapper }); + wid.options = { + ...this.options, + on_delete: () => this.api.blocks.delete() + } wid.customize(this.options); this.wrapper.setAttribute("card_name", wid.label); this.new_card_widget = wid.get_config(); @@ -163,7 +166,8 @@ export default class Card { container: this.wrapper, type: "links", options: this.options, - widgets: card + widgets: card, + api: this.api }); this.wrapper.setAttribute("card_name", card_name); if (!this.readOnly) { diff --git a/frappe/public/js/frappe/wiki_blocks/shortcut.js b/frappe/public/js/frappe/wiki_blocks/shortcut.js index 53b5a5eed5..138ff8eac7 100644 --- a/frappe/public/js/frappe/wiki_blocks/shortcut.js +++ b/frappe/public/js/frappe/wiki_blocks/shortcut.js @@ -27,7 +27,7 @@ export default class Shortcut { allow_create: this.allow_customization, allow_delete: this.allow_customization, allow_hiding: false, - allow_edit: true, + allow_edit: true }; } @@ -72,9 +72,12 @@ export default class Shortcut { let wid = frappe.widget.make_widget({ ...widget, widget_type: 'shortcut', - container: this.wrapper, - options: this.options, + container: this.wrapper }); + wid.options = { + ...this.options, + on_delete: () => this.api.blocks.delete(), + } wid.customize(this.options); this.wrapper.setAttribute("shortcut_name", wid.label); this.new_shortcut_widget = wid.get_config(); @@ -162,7 +165,8 @@ export default class Shortcut { container: this.wrapper, type: "shortcut", options: this.options, - widgets: shortcut + widgets: shortcut, + api: this.api }); this.wrapper.setAttribute("shortcut_name", shortcut_name); if (!this.readOnly) { From e07fb1f736e459af0668fa83e8a5c23e5793a4d4 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Mon, 17 May 2021 15:50:39 +0530 Subject: [PATCH 009/306] fix: Edit Shortcut --- frappe/desk/desktop.py | 6 ++++ frappe/desk/doctype/workspace/workspace.py | 5 ---- frappe/public/js/frappe/views/wiki.js | 30 +++++++++---------- .../public/js/frappe/widgets/base_widget.js | 1 + .../public/js/frappe/widgets/widget_group.js | 9 ++++-- frappe/public/js/frappe/wiki_blocks/card.js | 2 +- .../public/js/frappe/wiki_blocks/shortcut.js | 30 ++++++++++++------- 7 files changed, 49 insertions(+), 34 deletions(-) diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index c096f50b78..2a09978744 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -4,6 +4,7 @@ from __future__ import unicode_literals import frappe +import json from json import loads, dumps from frappe import _, DoesNotExistError, ValidationError, _dict from frappe.boot import get_allowed_pages, get_allowed_reports @@ -549,6 +550,11 @@ def save_new_widget(page, new_widgets): if widgets.card: original_page.build_links_table_from_card(widgets.card) + content = frappe.db.get_value("Internal Wiki Page", page, "content") + for wid in ['shortcut']: + widd = [x['data'][ wid + '_name'] for x in json.loads(content) if x['type'] == wid] + original_page.set(wid+'s', [ele for ele in original_page.get(wid+'s') if ele.label in widd]) + try: original_page.save(ignore_permissions=True) except (ValidationError, TypeError) as e: diff --git a/frappe/desk/doctype/workspace/workspace.py b/frappe/desk/doctype/workspace/workspace.py index 20c9240188..18aa383455 100644 --- a/frappe/desk/doctype/workspace/workspace.py +++ b/frappe/desk/doctype/workspace/workspace.py @@ -101,13 +101,8 @@ class Workspace(Document): }) def build_links_table_from_card(self, config): - # Empty links table - # self.links = [] - # order = config.get('order') - # widgets = config.get('widgets') for idx, card in enumerate(config): - # card = widgets[name].copy() links = loads(card.get('links')) self.append('links', { diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index ec4f2a49e8..057ae25902 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -404,6 +404,7 @@ frappe.views.Wiki = class Wiki { this.dirty = true; }, readOnly: true, + logLevel: 'ERROR' }); } @@ -440,22 +441,19 @@ frappe.views.Wiki = class Wiki { frappe.dom.unfreeze(); if (res.message) { let cur_page = res.message; - if (!$.isEmptyObject(new_widgets)) { - frappe.call('frappe.desk.desktop.save_new_widget', { - page: me.title, - new_widgets: new_widgets - }).then(res => { - if (res.message) { - me.reload(); - } - }); - } - frappe.show_alert({ message: __("Page Saved Successfully"), indicator: "green" }); - me.title = ''; - me.parent = ''; - me.sorted_sidebar_items = []; - me.new_page = cur_page; - me.reload(); + frappe.call('frappe.desk.desktop.save_new_widget', { + page: me.title, + new_widgets: new_widgets + }).then(res => { + if (res.message) { + frappe.show_alert({ message: __("Page Saved Successfully"), indicator: "green" }); + me.title = ''; + me.parent = ''; + me.sorted_sidebar_items = []; + me.new_page = cur_page; + me.reload(); + } + }); } } }); diff --git a/frappe/public/js/frappe/widgets/base_widget.js b/frappe/public/js/frappe/widgets/base_widget.js index 9bbfb916e5..821df609ef 100644 --- a/frappe/public/js/frappe/widgets/base_widget.js +++ b/frappe/public/js/frappe/widgets/base_widget.js @@ -170,6 +170,7 @@ export default class Widget { data.name = this.name; this.refresh(); + this.options.on_edit && this.options.on_edit(data); }, primary_action_label: __("Save") }); diff --git a/frappe/public/js/frappe/widgets/widget_group.js b/frappe/public/js/frappe/widgets/widget_group.js index 2b85359330..913a362932 100644 --- a/frappe/public/js/frappe/widgets/widget_group.js +++ b/frappe/public/js/frappe/widgets/widget_group.js @@ -208,7 +208,8 @@ export class SingleWidgetGroup { }); widget_object.options = { ...this.options, - on_delete: (name) => this.on_delete(name) + on_delete: () => this.on_delete(), + on_edit: () => this.on_edit(widget_object) }; this.widgets_list.push(widget_object); this.widgets_dict[widget.name] = widget_object; @@ -216,10 +217,14 @@ export class SingleWidgetGroup { return widget_object; } - on_delete(name, setup_new) { + on_delete() { this.api.blocks.delete(); } + on_edit(widget_object) { + this.block.call("on_edit", widget_object); + } + customize() { this.widgets_list.forEach((wid) => { wid.customize(this.options); diff --git a/frappe/public/js/frappe/wiki_blocks/card.js b/frappe/public/js/frappe/wiki_blocks/card.js index f06e4754e0..89821129e0 100644 --- a/frappe/public/js/frappe/wiki_blocks/card.js +++ b/frappe/public/js/frappe/wiki_blocks/card.js @@ -78,7 +78,7 @@ export default class Card { wid.options = { ...this.options, on_delete: () => this.api.blocks.delete() - } + }; wid.customize(this.options); this.wrapper.setAttribute("card_name", wid.label); this.new_card_widget = wid.get_config(); diff --git a/frappe/public/js/frappe/wiki_blocks/shortcut.js b/frappe/public/js/frappe/wiki_blocks/shortcut.js index 138ff8eac7..f57c9ef7f1 100644 --- a/frappe/public/js/frappe/wiki_blocks/shortcut.js +++ b/frappe/public/js/frappe/wiki_blocks/shortcut.js @@ -11,9 +11,10 @@ export default class Shortcut { return true; } - constructor({data, api, config, readOnly}) { + constructor({data, api, config, readOnly, block}) { this.data = data; this.api = api; + this.block = block; this.config = config; this.readOnly = readOnly; this.col = this.data.col ? this.data.col : "12"; @@ -69,18 +70,19 @@ export default class Shortcut { type: 'shortcut', primary_action: (widget) => { widget.in_customize_mode = 1; - let wid = frappe.widget.make_widget({ + this.shortcut_widget = frappe.widget.make_widget({ ...widget, widget_type: 'shortcut', container: this.wrapper }); - wid.options = { + this.shortcut_widget.options = { ...this.options, on_delete: () => this.api.blocks.delete(), - } - wid.customize(this.options); - this.wrapper.setAttribute("shortcut_name", wid.label); - this.new_shortcut_widget = wid.get_config(); + on_edit: () => this.on_edit(this.shortcut_widget) + }; + this.shortcut_widget.customize(this.options); + this.wrapper.setAttribute("shortcut_name", this.shortcut_widget.label); + this.new_shortcut_widget = this.shortcut_widget.get_config(); }, }); @@ -155,22 +157,30 @@ export default class Shortcut { this.shortcut_field.make(); } + on_edit(shortcut_obj) { + let shortcut = shortcut_obj.get_config(); + this.shortcut_widget.widgets = shortcut; + this.wrapper.setAttribute("shortcut_name", shortcut.label); + this.new_shortcut_widget = shortcut_obj.get_config(); + } + _make_shortcuts(shortcut_name) { let shortcut = this.config.page_data.shortcuts.items.find(obj => { return obj.label == shortcut_name; }); this.wrapper.innerHTML = ''; shortcut.in_customize_mode = !this.readOnly; - let shortcut_widget = new frappe.widget.SingleWidgetGroup({ + this.shortcut_widget = new frappe.widget.SingleWidgetGroup({ container: this.wrapper, type: "shortcut", options: this.options, widgets: shortcut, - api: this.api + api: this.api, + block: this.block }); this.wrapper.setAttribute("shortcut_name", shortcut_name); if (!this.readOnly) { - shortcut_widget.customize(); + this.shortcut_widget.customize(); } } } \ No newline at end of file From ca89fa6a32a7bfb4488bb5af28f6af29aa0cf915 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 18 May 2021 14:31:34 +0530 Subject: [PATCH 010/306] fix: Edit & Delete Card --- frappe/desk/desktop.py | 19 +++++++-- frappe/desk/doctype/workspace/workspace.py | 13 ++++-- .../public/js/frappe/widgets/links_widget.js | 12 ++++-- .../public/js/frappe/widgets/widget_dialog.js | 6 +-- .../public/js/frappe/widgets/widget_group.js | 10 ++--- frappe/public/js/frappe/wiki_blocks/card.js | 40 ++++++++++++------- .../public/js/frappe/wiki_blocks/shortcut.js | 12 +++--- 7 files changed, 74 insertions(+), 38 deletions(-) diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index 2a09978744..3713a489e3 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -550,10 +550,23 @@ def save_new_widget(page, new_widgets): if widgets.card: original_page.build_links_table_from_card(widgets.card) + # remove duplicate and unwanted widgets content = frappe.db.get_value("Internal Wiki Page", page, "content") - for wid in ['shortcut']: - widd = [x['data'][ wid + '_name'] for x in json.loads(content) if x['type'] == wid] - original_page.set(wid+'s', [ele for ele in original_page.get(wid+'s') if ele.label in widd]) + page_widgets = {} + for wid in ['shortcut', 'card', 'chart']: + # get list of widget's name from internal wiki page + page_widgets[wid] = [x['data'][wid + '_name'] for x in json.loads(content) if x['type'] == wid] + + updated_widgets = [] + original_page.get('shortcuts').reverse() + for w in original_page.get('shortcuts'): + if w.label in page_widgets['shortcut'] and w.label not in [x.label for x in updated_widgets]: + updated_widgets.append(w) + original_page.set('shortcuts', updated_widgets) + + for i, v in enumerate(original_page.links): + if v.type == 'Card Break' and v.label not in page_widgets['card']: + del original_page.links[ i : i+v.link_count+1] try: original_page.save(ignore_permissions=True) diff --git a/frappe/desk/doctype/workspace/workspace.py b/frappe/desk/doctype/workspace/workspace.py index 18aa383455..7e50b8db70 100644 --- a/frappe/desk/doctype/workspace/workspace.py +++ b/frappe/desk/doctype/workspace/workspace.py @@ -105,11 +105,18 @@ class Workspace(Document): for idx, card in enumerate(config): links = loads(card.get('links')) + # remove duplicate before adding + duplicate_links = [x for x in self.links if(x.label == card.get('label') and x.type == 'Card Break')] + for v in duplicate_links: + del self.links[ v.idx-1 : v.idx+v.link_count] + self.append('links', { "label": card.get('label'), "type": "Card Break", "icon": card.get('icon'), - "hidden": card.get('hidden') or False + "hidden": card.get('hidden') or False, + "link_count": card.get('link_count'), + "idx": self.links[-1].idx + 1 }) for link in links: @@ -121,10 +128,10 @@ class Workspace(Document): "onboard": link.get('onboard'), "only_for": link.get('only_for'), "dependencies": link.get('dependencies'), - "is_query_report": link.get('is_query_report') + "is_query_report": link.get('is_query_report'), + "idx": self.links[-1].idx + 1 }) - def disable_saving_as_standard(): return frappe.flags.in_install or \ frappe.flags.in_patch or \ diff --git a/frappe/public/js/frappe/widgets/links_widget.js b/frappe/public/js/frappe/widgets/links_widget.js index 05280a22c8..26d52c1fcc 100644 --- a/frappe/public/js/frappe/widgets/links_widget.js +++ b/frappe/public/js/frappe/widgets/links_widget.js @@ -12,14 +12,18 @@ export default class LinksWidget extends Widget { return { name: this.name, links: JSON.stringify(this.links), + link_count: this.links.length, label: this.label, hidden: this.hidden, }; } set_body() { - this.options = {}; - this.options.links = this.links; + + if (!this.options) { + this.options = {}; + this.options.links = this.links; + } this.widget.addClass("links-widget-box"); const is_link_disabled = item => { return item.dependencies && item.incomplete_dependencies; @@ -74,7 +78,9 @@ export default class LinksWidget extends Widget { ${get_link_for_item(item)} `); }); - + if (this.in_customize_mode) { + this.body.empty(); + } this.link_list.forEach(link => link.appendTo(this.body)); } diff --git a/frappe/public/js/frappe/widgets/widget_dialog.js b/frappe/public/js/frappe/widgets/widget_dialog.js index 5bcaaf9e3e..02be3bd15a 100644 --- a/frappe/public/js/frappe/widgets/widget_dialog.js +++ b/frappe/public/js/frappe/widgets/widget_dialog.js @@ -142,9 +142,9 @@ class CardDialog extends WidgetDialog { fieldtype: 'Table', label: __('Card Links'), editable_grid: 1, - data: this.data || [], + data: me.values ? JSON.parse(me.values.links) : [], get_data: () => { - return this.data || []; + return me.values ? JSON.parse(me.values.links) : []; }, fields: [ { @@ -529,7 +529,7 @@ export default function get_dialog_constructor(type) { chart: ChartDialog, shortcut: ShortcutDialog, number_card: NumberCardDialog, - card: CardDialog, + links: CardDialog, }; return widget_map[type] || WidgetDialog; diff --git a/frappe/public/js/frappe/widgets/widget_group.js b/frappe/public/js/frappe/widgets/widget_group.js index 913a362932..d8f92edc5d 100644 --- a/frappe/public/js/frappe/widgets/widget_group.js +++ b/frappe/public/js/frappe/widgets/widget_group.js @@ -205,12 +205,12 @@ export class SingleWidgetGroup { widget_type: this.type, container: this.container, height: this.height || null, + options: { + ...this.options, + on_delete: () => this.on_delete(), + on_edit: () => this.on_edit(widget_object) + } }); - widget_object.options = { - ...this.options, - on_delete: () => this.on_delete(), - on_edit: () => this.on_edit(widget_object) - }; this.widgets_list.push(widget_object); this.widgets_dict[widget.name] = widget_object; diff --git a/frappe/public/js/frappe/wiki_blocks/card.js b/frappe/public/js/frappe/wiki_blocks/card.js index 89821129e0..5426fd24ce 100644 --- a/frappe/public/js/frappe/wiki_blocks/card.js +++ b/frappe/public/js/frappe/wiki_blocks/card.js @@ -11,9 +11,10 @@ export default class Card { return true; } - constructor({data, api, config, readOnly}) { + constructor({data, api, config, readOnly, block}) { this.data = data; this.api = api; + this.block = block; this.config = config; this.readOnly = readOnly; this.sections = {}; @@ -28,7 +29,7 @@ export default class Card { allow_create: this.allow_customization, allow_delete: this.allow_customization, allow_hiding: false, - allow_edit: false, + allow_edit: true, }; } @@ -64,24 +65,25 @@ export default class Card { } _new_card() { - const dialog_class = get_dialog_constructor('card'); + const dialog_class = get_dialog_constructor('links'); this.dialog = new dialog_class({ label: this.label, type: 'card', primary_action: (widget) => { widget.in_customize_mode = 1; - let wid = frappe.widget.make_widget({ + this.card_widget = frappe.widget.make_widget({ ...widget, widget_type: 'links', - container: this.wrapper + container: this.wrapper, + options: { + ...this.options, + on_delete: () => this.api.blocks.delete(), + on_edit: () => this.on_edit(this.card_widget) + } }); - wid.options = { - ...this.options, - on_delete: () => this.api.blocks.delete() - }; - wid.customize(this.options); - this.wrapper.setAttribute("card_name", wid.label); - this.new_card_widget = wid.get_config(); + this.card_widget.customize(this.options); + this.wrapper.setAttribute("card_name", this.card_widget.label); + this.new_card_widget = this.card_widget.get_config(); }, }); @@ -156,22 +158,30 @@ export default class Card { this.card_field.make(); } + on_edit(card_obj) { + let card = card_obj.get_config(); + this.card_widget.widgets = card; + this.wrapper.setAttribute("card_name", card.label); + this.new_card_widget = card_obj.get_config(); + } + _make_cards(card_name) { let card = this.config.page_data.cards.items.find(obj => { return obj.label == card_name; }); this.wrapper.innerHTML = ''; card.in_customize_mode = !this.readOnly; - let card_widget = new frappe.widget.SingleWidgetGroup({ + this.card_widget = new frappe.widget.SingleWidgetGroup({ container: this.wrapper, type: "links", options: this.options, widgets: card, - api: this.api + api: this.api, + block: this.block }); this.wrapper.setAttribute("card_name", card_name); if (!this.readOnly) { - card_widget.customize(); + this.card_widget.customize(); } } } \ No newline at end of file diff --git a/frappe/public/js/frappe/wiki_blocks/shortcut.js b/frappe/public/js/frappe/wiki_blocks/shortcut.js index f57c9ef7f1..ba98cbc382 100644 --- a/frappe/public/js/frappe/wiki_blocks/shortcut.js +++ b/frappe/public/js/frappe/wiki_blocks/shortcut.js @@ -73,13 +73,13 @@ export default class Shortcut { this.shortcut_widget = frappe.widget.make_widget({ ...widget, widget_type: 'shortcut', - container: this.wrapper + container: this.wrapper, + options: { + ...this.options, + on_delete: () => this.api.blocks.delete(), + on_edit: () => this.on_edit(this.shortcut_widget) + } }); - this.shortcut_widget.options = { - ...this.options, - on_delete: () => this.api.blocks.delete(), - on_edit: () => this.on_edit(this.shortcut_widget) - }; this.shortcut_widget.customize(this.options); this.wrapper.setAttribute("shortcut_name", this.shortcut_widget.label); this.new_shortcut_widget = this.shortcut_widget.get_config(); From 7ce6a776d04bfa0b52c562275f6c8198bfebce07 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 18 May 2021 16:44:14 +0530 Subject: [PATCH 011/306] fix: Remove duplicate card fix --- frappe/desk/doctype/workspace/workspace.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/desk/doctype/workspace/workspace.py b/frappe/desk/doctype/workspace/workspace.py index 7e50b8db70..d9bf5fa618 100644 --- a/frappe/desk/doctype/workspace/workspace.py +++ b/frappe/desk/doctype/workspace/workspace.py @@ -106,9 +106,9 @@ class Workspace(Document): links = loads(card.get('links')) # remove duplicate before adding - duplicate_links = [x for x in self.links if(x.label == card.get('label') and x.type == 'Card Break')] - for v in duplicate_links: - del self.links[ v.idx-1 : v.idx+v.link_count] + for idx, link in enumerate(self.links): + if link.label == card.get('label') and link.type == 'Card Break': + del self.links[idx : idx + link.link_count + 1] self.append('links', { "label": card.get('label'), From c6c2eeed72b2cd4e4ed572e37ca64bf6884b6225 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 18 May 2021 17:54:42 +0530 Subject: [PATCH 012/306] fix: Add, Edit & Delete Chart --- frappe/desk/desktop.py | 41 +++++---- frappe/public/js/frappe/wiki_blocks/chart.js | 89 +++++++++++++------- 2 files changed, 83 insertions(+), 47 deletions(-) diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index 3713a489e3..6d0356747d 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -551,22 +551,7 @@ def save_new_widget(page, new_widgets): original_page.build_links_table_from_card(widgets.card) # remove duplicate and unwanted widgets - content = frappe.db.get_value("Internal Wiki Page", page, "content") - page_widgets = {} - for wid in ['shortcut', 'card', 'chart']: - # get list of widget's name from internal wiki page - page_widgets[wid] = [x['data'][wid + '_name'] for x in json.loads(content) if x['type'] == wid] - - updated_widgets = [] - original_page.get('shortcuts').reverse() - for w in original_page.get('shortcuts'): - if w.label in page_widgets['shortcut'] and w.label not in [x.label for x in updated_widgets]: - updated_widgets.append(w) - original_page.set('shortcuts', updated_widgets) - - for i, v in enumerate(original_page.links): - if v.type == 'Card Break' and v.label not in page_widgets['card']: - del original_page.links[ i : i+v.link_count+1] + clean_up(original_page, page) try: original_page.save(ignore_permissions=True) @@ -586,6 +571,30 @@ def save_new_widget(page, new_widgets): return True +def clean_up(original_page, page): + page_widgets = {} + + content = frappe.db.get_value("Internal Wiki Page", page, "content") + + for wid in ['shortcut', 'card', 'chart']: + # get list of widget's name from internal wiki page + page_widgets[wid] = [x['data'][wid + '_name'] for x in json.loads(content) if x['type'] == wid] + + # shortcut & chart cleanup + for wid in ['shortcut', 'chart']: + updated_widgets = [] + original_page.get(wid+'s').reverse() + + for w in original_page.get(wid+'s'): + if w.label in page_widgets[wid] and w.label not in [x.label for x in updated_widgets]: + updated_widgets.append(w) + original_page.set(wid+'s', updated_widgets) + + # card cleanup + for i, v in enumerate(original_page.links): + if v.type == 'Card Break' and v.label not in page_widgets['card']: + del original_page.links[i : i+v.link_count+1] + def new_widget(config, doctype, parentfield): if not config: return [] diff --git a/frappe/public/js/frappe/wiki_blocks/chart.js b/frappe/public/js/frappe/wiki_blocks/chart.js index 1d637ef5b6..6c51ad873e 100644 --- a/frappe/public/js/frappe/wiki_blocks/chart.js +++ b/frappe/public/js/frappe/wiki_blocks/chart.js @@ -1,3 +1,4 @@ +import get_dialog_constructor from "../widgets/widget_dialog.js"; export default class Chart { static get toolbox() { return { @@ -10,34 +11,32 @@ export default class Chart { return true; } - constructor({data, api, config, readOnly}) { + constructor({data, api, config, readOnly, block}) { this.data = data; this.api = api; + this.block = block; this.config = config; this.readOnly = readOnly; - this.sections = {}; this.col = this.data.col ? this.data.col : "12"; this.pt = this.data.pt ? this.data.pt : "0"; this.pr = this.data.pr ? this.data.pr : "0"; this.pb = this.data.pb ? this.data.pb : "0"; this.pl = this.data.pl ? this.data.pl : "0"; this.allow_customization = !this.readOnly; + this.options = { + allow_sorting: this.allow_customization, + allow_create: this.allow_customization, + allow_delete: this.allow_customization, + allow_hiding: false, + allow_edit: true, + max_widget_count: 2, + }; } render() { - let me = this; this.wrapper = document.createElement('div'); - this._make_fieldgroup(this.wrapper, [{ - fieldtype: "Select", - label: "Chart Name", - fieldname: "chart_name", - options: this.config.page_data.charts.items.map(({ chart_name }) => chart_name), - change: function() { - if (this.value) { - me._make_charts(this.value); - } - } - }]); + this._new_chart(); + if (this.data && this.data.chart_name) { this._make_charts(this.data.chart_name); } @@ -51,7 +50,8 @@ export default class Chart { pt: this._getPadding("t"), pr: this._getPadding("r"), pb: this._getPadding("b"), - pl: this._getPadding("l") + pl: this._getPadding("l"), + new: this.new_chart_widget }; } @@ -64,6 +64,34 @@ export default class Chart { e.classList.add("pl-" + this.pl); } + _new_chart() { + const dialog_class = get_dialog_constructor('chart'); + this.dialog = new dialog_class({ + label: this.label, + type: 'chart', + primary_action: (widget) => { + widget.in_customize_mode = 1; + this.chart_widget = frappe.widget.make_widget({ + ...widget, + widget_type: 'chart', + container: this.wrapper, + options: { + ...this.options, + on_delete: () => this.api.blocks.delete(), + on_edit: () => this.on_edit(this.chart_widget) + } + }); + this.chart_widget.customize(this.options); + this.wrapper.setAttribute("chart_name", this.chart_widget.label); + this.new_chart_widget = this.chart_widget.get_config(); + }, + }); + + if (!this.readOnly && this.data && !this.data.chart_name) { + this.dialog.make(); + } + } + _getCol() { var e = 12; var t = "col-12"; @@ -130,32 +158,31 @@ export default class Chart { this.chart_field.make(); } + on_edit(chart_obj) { + let chart = chart_obj.get_config(); + this.chart_widget.widgets = chart; + this.wrapper.setAttribute("chart_name", chart.label); + this.new_chart_widget = chart_obj.get_config(); + } + _make_charts(chart_name) { let chart = this.config.page_data.charts.items.find(obj => { - return obj.chart_name == chart_name; + return obj.label == chart_name; }); + if (!chart) return; this.wrapper.innerHTML = ''; - this.sections = {}; - chart.in_customize_mode = !this.readOnly; - this.sections["charts"] = new frappe.widget.SingleWidgetGroup({ + this.chart_widget = new frappe.widget.SingleWidgetGroup({ container: this.wrapper, type: "chart", - columns: 1, class_name: "widget-charts", - // hidden: Boolean(this.onboarding_widget), - options: { - allow_sorting: this.allow_customization, - allow_create: this.allow_customization, - allow_delete: this.allow_customization, - allow_hiding: false, - allow_edit: true, - max_widget_count: 2, - }, - widgets: chart + options: this.options, + widgets: chart, + api: this.api, + block: this.block }); this.wrapper.setAttribute("chart_name", chart_name); if (!this.readOnly) { - this.sections["charts"].customize(); + this.chart_widget.customize(); } } } \ No newline at end of file From a2248192e1273298a932e06b03b2a7dd00c389f2 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 18 May 2021 21:42:59 +0530 Subject: [PATCH 013/306] fix: Chart config fix --- frappe/public/js/frappe/views/wiki.js | 10 ++++++++++ frappe/public/js/frappe/widgets/chart_widget.js | 2 ++ 2 files changed, 12 insertions(+) diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index 057ae25902..4b52708194 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -207,6 +207,16 @@ frappe.views.Wiki = class Wiki { page: page }).then(data => { this.page_data = data; + if (!this.page_data) return; + + return frappe.dashboard_utils.get_dashboard_settings().then(settings => { + let chart_config = settings.chart_config ? JSON.parse(settings.chart_config) : {}; + if (this.page_data.charts.items) { + this.page_data.charts.items.map(chart => { + chart.chart_settings = chart_config[chart.chart_name] || {}; + }); + } + }); }); } diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js index 0c36f013ec..44f3edc038 100644 --- a/frappe/public/js/frappe/widgets/chart_widget.js +++ b/frappe/public/js/frappe/widgets/chart_widget.js @@ -349,6 +349,8 @@ export default class ChartWidget extends Widget { } setup_filter_button() { + if (this.in_customize_mode) return; + this.is_document_type = this.chart_doc.chart_type !== "Report" && this.chart_doc.chart_type !== "Custom"; From aa0151ce744b3b13265f9f6cfa4e0724c38e4afb Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 19 May 2021 16:28:40 +0530 Subject: [PATCH 014/306] fix: Drag, Delete sidebar page --- frappe/desk/desktop.py | 1 - .../internal_wiki_page/internal_wiki_page.py | 15 ++- frappe/public/js/frappe/views/wiki.js | 110 +++++++++++++----- frappe/public/scss/desk/wiki.scss | 17 +++ 4 files changed, 109 insertions(+), 34 deletions(-) diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index 6d0356747d..a87ca6bc02 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -538,7 +538,6 @@ def save_customization(page, config): return True -@frappe.whitelist() def save_new_widget(page, new_widgets): original_page = frappe.get_doc("Workspace", page) widgets = _dict(loads(new_widgets)) diff --git a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py index 6e695ef516..3fba588343 100644 --- a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py +++ b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py @@ -5,6 +5,7 @@ from __future__ import unicode_literals import frappe import json +from frappe.desk.desktop import save_new_widget from frappe.model.document import Document class InternalWikiPage(Document): @@ -16,7 +17,7 @@ class InternalWikiPage(Document): self.sequence_id = frappe.get_last_doc('Internal Wiki Page').sequence_id + 1 @frappe.whitelist() -def save_wiki_page(title, parent, sb_items, blocks, save=True): +def save_wiki_page(title, parent, sb_items, deleted_pages, new_widgets, blocks, save=True): if save: if not frappe.db.exists("Workspace", title): wspace = frappe.new_doc('Workspace') @@ -38,6 +39,18 @@ def save_wiki_page(title, parent, sb_items, blocks, save=True): doc = frappe.get_doc('Internal Wiki Page', d.get('name')) doc.sequence_id = d.get('sequence_id') doc.save() + + if json.loads(deleted_pages): + for d in json.loads(deleted_pages): + wiki_doc = frappe.get_doc('Internal Wiki Page', d) + wiki_doc.delete() + wspace_doc = frappe.get_doc('Workspace', d) + if not wspace_doc.is_standard: + wspace_doc.delete() + return 'Build' + + if json.loads(new_widgets): + save_new_widget(title, new_widgets) return doc.title diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index 4b52708194..1053f7b76e 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -12,6 +12,7 @@ frappe.views.Wiki = class Wiki { this.sections = {}; this.sidebar_items = {}; this.sorted_sidebar_items = []; + this.deleted_sidebar_items = []; this.tools = {}; this.isReadOnly = true; this.new_page = null; @@ -37,13 +38,13 @@ frappe.views.Wiki = class Wiki { for (let page of this.all_pages || []) { frappe.wiki_pages[frappe.router.slug(page.name)] = page; } - frappe.router.route(); this.make_sidebar(root_pages); } if (this.new_page) { frappe.set_route(`wiki/${frappe.router.slug(this.new_page)}`); this.new_page = null; } + frappe.router.route(); }); } @@ -65,12 +66,12 @@ frappe.views.Wiki = class Wiki {
${frappe.utils.icon(item.icon || "folder-normal", "md")} ${item.label || item.name} - +
@@ -85,25 +86,34 @@ frappe.views.Wiki = class Wiki { const get_child_item = function (item) { return $(` -
- - ${frappe.utils.icon(item.icon || "folder-normal", "md")} - ${item.label || item.name} - +
+
+ + ${frappe.utils.icon(item.icon || "folder-normal", "md")} + ${item.label || item.name} + +
+
`); }; const make_sidebar_child_item = item => { let $child_item = get_child_item(item); + let sidebar_control = $child_item.find('.sidebar-item-control'); + this.add_sidebar_actions(item, sidebar_control); $child_item.appendTo(child_item_section); this.sidebar_items[item.name] = $child_item; }; let $item = get_sidebar_item(item); + let sidebar_control = $item.find('.sidebar-item-control'); + this.add_sidebar_actions(item, sidebar_control); + let $drop_icon = $(``); + $drop_icon.appendTo(sidebar_control); let drop_icon = $item.find('.drop-icon').get(0); let child_item_section = $item.find('.sidebar-child-item').get(0); if (this.all_pages.some(e => e.parent_page == item.name)) { @@ -260,7 +270,6 @@ frappe.views.Wiki = class Wiki { setup_actions() { this.page.clear_inner_toolbar(); - this.page.set_secondary_action( __("Customize"), () => { @@ -271,9 +280,9 @@ frappe.views.Wiki = class Wiki { this.undo = new Undo({ editor: this.editor }); this.undo.initialize({blocks: JSON.parse(this.content)}); this.setup_customization_buttons(); + this.show_sidebar_actions(); this.make_sidebar_sortable(); this.make_blocks_sortable(); - // this.customize(); }); }, ); @@ -283,10 +292,55 @@ frappe.views.Wiki = class Wiki { }); } + show_sidebar_actions() { + $('.sidebar-item-control .drag-handle').removeClass('hidden'); + $('.sidebar-item-control .delete-page').removeClass('hidden'); + } + + add_sidebar_actions(item, sidebar_control) { + this.add_custom_button( + frappe.utils.icon('drag', 'xs'), + null, + "drag-handle hidden", + `${__('Drag')}`, + null, + sidebar_control + ); + this.add_custom_button( + frappe.utils.icon('delete', 'xs'), + () => this.delete_page(item.name), + "delete-page hidden", + `${__('Delete')}`, + null, + sidebar_control + ); + } + + add_custom_button(html, action, class_name = "", title="", btn_type, wrapper) { + if (!btn_type) btn_type = 'btn-secondary'; + let button = $( + `` + ); + button.click(event => { + event.stopPropagation(); + action && action(); + }); + button.appendTo(wrapper); + } + + delete_page(name) { + if (!this.deleted_sidebar_items.includes(name)) { + this.deleted_sidebar_items.push(name) + } + frappe.confirm(__("Are you sure you want to delete page {0}?", [name]), () => { + this.sidebar.find(`.standard-sidebar-section [item-name="${name}"]`).addClass('hidden') + }); + } + make_sidebar_sortable() { let me = this; this.sidebar_sortable = Sortable.create(this.page.sidebar.find(".standard-sidebar-section").get(0), { - handle: ".standard-sidebar-item-container", + handle: ".drag-handle", draggable: ".standard-sidebar-item-container", animation: 150, onEnd: function (evt) { @@ -353,6 +407,7 @@ frappe.views.Wiki = class Wiki { this.isReadOnly = true; this.page_sortable.option("disabled", true); this.sidebar_sortable.option("disabled", true); + this.deleted_sidebar_items = []; this.reload(); frappe.show_alert({ message: __("Customizations Discarded"), indicator: "info" }); } @@ -372,10 +427,6 @@ frappe.views.Wiki = class Wiki { this.setup_customization_buttons(); this.title = values.title; this.parent = values.parent; - // const index = this.all_pages.findIndex(e => e.selected == true ) - // this.all_pages[index].selected = false; - // let item = {name: this.title, selected: true} - // this.make_sidebar([...this.all_pages, item], 'new') this.editor.render({ blocks: [ { @@ -444,26 +495,21 @@ frappe.views.Wiki = class Wiki { title: me.title, parent: me.parent || '', sb_items: me.sorted_sidebar_items, + deleted_pages: me.deleted_sidebar_items, + new_widgets: new_widgets, blocks: JSON.stringify(outputData.blocks), save: save }, callback: function(res) { frappe.dom.unfreeze(); if (res.message) { - let cur_page = res.message; - frappe.call('frappe.desk.desktop.save_new_widget', { - page: me.title, - new_widgets: new_widgets - }).then(res => { - if (res.message) { - frappe.show_alert({ message: __("Page Saved Successfully"), indicator: "green" }); - me.title = ''; - me.parent = ''; - me.sorted_sidebar_items = []; - me.new_page = cur_page; - me.reload(); - } - }); + frappe.show_alert({ message: __("Page Saved Successfully"), indicator: "green" }); + me.title = ''; + me.parent = ''; + me.sorted_sidebar_items = []; + me.deleted_sidebar_items = []; + me.new_page = res.message; + me.reload(); } } }); diff --git a/frappe/public/scss/desk/wiki.scss b/frappe/public/scss/desk/wiki.scss index 8c464a7a48..e0a3727f4f 100644 --- a/frappe/public/scss/desk/wiki.scss +++ b/frappe/public/scss/desk/wiki.scss @@ -14,6 +14,23 @@ .standard-sidebar-item { justify-content: space-between; + + .sidebar-item-control { + > * { + align-self: center; + margin-left: 3px; + box-shadow: none; + } + + .drag-handle { + cursor: all-scroll; + cursor: -webkit-grabbing; + } + + svg { + margin-right: 0; + } + } } .sidebar-child-item-container { From 8cf03b492175440403285ad1d9555e6c4aec508e Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 19 May 2021 18:43:24 +0530 Subject: [PATCH 015/306] fix: Blank to Spacer, Resizable Header --- frappe/public/js/frappe/views/wiki.js | 15 +- frappe/public/js/frappe/wiki_blocks/blocks.js | 6 +- frappe/public/js/frappe/wiki_blocks/header.js | 363 ++++++++++++++++++ .../wiki_blocks/{blank.js => spacer.js} | 6 +- frappe/public/scss/desk/wiki.scss | 11 + 5 files changed, 383 insertions(+), 18 deletions(-) create mode 100644 frappe/public/js/frappe/wiki_blocks/header.js rename frappe/public/js/frappe/wiki_blocks/{blank.js => spacer.js} (97%) diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index 1053f7b76e..165371e10c 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -1,7 +1,4 @@ import EditorJS from '@editorjs/editorjs'; -import Header from '@editorjs/header'; -import Checklist from '@editorjs/checklist'; -import List from '@editorjs/list'; import Undo from 'editorjs-undo'; frappe.views.Wiki = class Wiki { @@ -151,21 +148,13 @@ frappe.views.Wiki = class Wiki { if (this.content) { this.tools = { header: { - class: Header, + class: frappe.wiki_block.blocks['header'], inlineToolbar: true }, paragraph: { class: frappe.wiki_block.blocks['paragraph'], inlineToolbar: true }, - checklist: { - class: Checklist, - inlineToolbar: true, - }, - list: { - class: List, - inlineToolbar: true, - }, chart: { class: frappe.wiki_block.blocks['chart'], config: { @@ -184,7 +173,7 @@ frappe.views.Wiki = class Wiki { page_data: this.page_data || [] } }, - blank: frappe.wiki_block.blocks['blank'], + spacer: frappe.wiki_block.blocks['spacer'], spacingTune: frappe.wiki_block.tunes['spacing_tune'], }; if (this.editor) { diff --git a/frappe/public/js/frappe/wiki_blocks/blocks.js b/frappe/public/js/frappe/wiki_blocks/blocks.js index 239127a674..dc69db66ca 100644 --- a/frappe/public/js/frappe/wiki_blocks/blocks.js +++ b/frappe/public/js/frappe/wiki_blocks/blocks.js @@ -1,9 +1,10 @@ // import blocks +import Header from "../wiki_blocks/header"; import Paragraph from "../wiki_blocks/paragraph"; import Card from "../wiki_blocks/card"; import Chart from "../wiki_blocks/chart"; import Shortcut from "../wiki_blocks/shortcut"; -import Blank from "../wiki_blocks/blank"; +import Spacer from "../wiki_blocks/spacer"; // import tunes import SpacingTune from "../wiki_blocks/spacing_tune"; @@ -11,11 +12,12 @@ import SpacingTune from "../wiki_blocks/spacing_tune"; frappe.provide("frappe.wiki_block"); frappe.wiki_block.blocks = { + header: Header, paragraph: Paragraph, card: Card, chart: Chart, shortcut: Shortcut, - blank: Blank, + spacer: Spacer, }; frappe.wiki_block.tunes = { diff --git a/frappe/public/js/frappe/wiki_blocks/header.js b/frappe/public/js/frappe/wiki_blocks/header.js new file mode 100644 index 0000000000..f3da84a22f --- /dev/null +++ b/frappe/public/js/frappe/wiki_blocks/header.js @@ -0,0 +1,363 @@ +export default class Header { + + constructor({ data, config, api, readOnly }) { + this.api = api; + this.readOnly = readOnly; + + this._CSS = { + block: this.api.styles.block, + settingsButton: this.api.styles.settingsButton, + settingsButtonActive: this.api.styles.settingsButtonActive, + wrapper: 'ce-header', + }; + + this._settings = config; + this._data = this.normalizeData(data); + this.settingsButtons = []; + this._element = this.getTag(); + + this.data = data; + this.col = this.data.col ? this.data.col : "12"; + this.pt = this.data.pt ? this.data.pt : "0"; + this.pr = this.data.pr ? this.data.pr : "0"; + this.pb = this.data.pb ? this.data.pb : "0"; + this.pl = this.data.pl ? this.data.pl : "0"; + } + + normalizeData(data) { + const newData = {}; + + if (typeof data !== 'object') { + data = {}; + } + + newData.text = data.text || ''; + newData.level = parseInt(data.level) || this.defaultLevel.number; + newData.col = parseInt(data.col) || 12; + newData.pt = parseInt(data.pt) || 0; + newData.pr = parseInt(data.pr) || 0; + newData.pb = parseInt(data.pb) || 0; + newData.pl = parseInt(data.pl) || 0; + + return newData; + } + + render() { + if (!this.readOnly) { + this._element.classList.add('widget', 'header'); + this._element.style.minHeight = 50 + 'px'; + } + return this._element; + } + + renderSettings() { + const holder = document.createElement('DIV'); + + if (this.levels.length <= 1) { + return holder; + } + + this.levels.forEach(level => { + const selectTypeButton = document.createElement('SPAN'); + + selectTypeButton.classList.add(this._CSS.settingsButton); + + if (this.currentLevel.number === level.number) { + selectTypeButton.classList.add(this._CSS.settingsButtonActive); + } + + selectTypeButton.innerHTML = level.svg; + + selectTypeButton.dataset.level = level.number; + + selectTypeButton.addEventListener('click', () => { + this.setLevel(level.number); + }); + + holder.appendChild(selectTypeButton); + + this.settingsButtons.push(selectTypeButton); + }); + + return holder; + } + + setLevel(level) { + this.data = { + level: level, + text: this.data.text, + }; + + this.settingsButtons.forEach(button => { + button.classList.toggle(this._CSS.settingsButtonActive, parseInt(button.dataset.level) === level); + }); + } + + merge(data) { + const newData = { + text: this.data.text + data.text, + level: this.data.level, + }; + + this.data = newData; + } + + validate(blockData) { + return blockData.text.trim() !== ''; + } + + save(toolsContent) { + return { + text: toolsContent.innerHTML, + level: this.currentLevel.number, + col: this._getCol(), + pt: this._getPadding("t"), + pr: this._getPadding("r"), + pb: this._getPadding("b"), + pl: this._getPadding("l") + }; + } + + rendered() { + var e = this._element.parentNode.parentNode; + e.classList.add("col-" + this.col); + e.classList.add("pt-" + this.pt); + e.classList.add("pr-" + this.pr); + e.classList.add("pb-" + this.pb); + e.classList.add("pl-" + this.pl); + } + + _getCol() { + var e = 12; + var t = "col-12"; + var n = this._element.parentNode.parentNode; + var r = new RegExp(/\bcol-.+?\b/, "g"); + if (n.className.match(r)) { + n.classList.forEach(function (e) { + e.match(r) && (t = e); + }); + var a = t.split("-"); + e = parseInt(a[1]); + } + return e; + } + + _getPadding() { + var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; + var t = 0; + var n = "p" + e + "-0"; + var r = this._element.parentNode.parentNode; + var a = new RegExp(/\pl-.+?\b/, "g"); + var i = new RegExp(/\pr-.+?\b/, "g"); + var o = new RegExp(/\pt-.+?\b/, "g"); + var c = new RegExp(/\pb-.+?\b/, "g"); + if ("l" == e) { + if (r.className.match(a)) { + r.classList.forEach(function (e) { + e.match(a) && (n = e); + }); + var s = n.split("-"); + t = parseInt(s[1]); + } + } else if ("r" == e) { + if (r.className.match(i)) { + r.classList.forEach(function (e) { + e.match(i) && (n = e); + }); + var l = n.split("-"); + t = parseInt(l[1]); + } + } else if ("t" == e) { + if (r.className.match(o)) { + r.classList.forEach(function (e) { + e.match(o) && (n = e); + }); + var u = n.split("-"); + t = parseInt(u[1]); + } + } else if ("b" == e && r.className.match(c)) { + r.classList.forEach(function (e) { + e.match(c) && (n = e); + }); + var p = n.split("-"); + t = parseInt(p[1]); + } + return t; + } + + static get conversionConfig() { + return { + export: 'text', // use 'text' property for other blocks + import: 'text', // fill 'text' property from other block's export string + }; + } + + static get sanitize() { + return { + level: false, + text: {}, + }; + } + + static get isReadOnlySupported() { + return true; + } + + get data() { + this._data.text = this._element.innerHTML; + this._data.level = this.currentLevel.number; + + return this._data; + } + + set data(data) { + this._data = this.normalizeData(data); + + if (data.level !== undefined && this._element.parentNode) { + const newHeader = this.getTag(); + newHeader.innerHTML = this._element.innerHTML; + this._element.parentNode.replaceChild(newHeader, this._element); + this._element = newHeader; + } + + if (data.text !== undefined) { + this._element.innerHTML = this._data.text || ''; + } + + if (!this.readOnly) { + this._element.classList.add('widget', 'header'); + this._element.style.minHeight = 50 + 'px'; + } + } + + getTag() { + const tag = document.createElement(this.currentLevel.tag); + + tag.innerHTML = this._data.text || ''; + + tag.classList.add(this._CSS.wrapper); + + tag.contentEditable = this.readOnly ? 'false' : 'true'; + + tag.dataset.placeholder = this.api.i18n.t(this._settings.placeholder || ''); + + return tag; + } + + get currentLevel() { + let level = this.levels.find(levelItem => levelItem.number === this._data.level); + + if (!level) { + level = this.defaultLevel; + } + + return level; + } + + get defaultLevel() { + if (this._settings.defaultLevel) { + const userSpecified = this.levels.find(levelItem => { + return levelItem.number === this._settings.defaultLevel; + }); + + if (userSpecified) { + return userSpecified; + } else { + console.warn('(ง\'̀-\'́)ง Heading Tool: the default level specified was not found in available levels'); + } + } + + return this.levels[1]; + } + + get levels() { + const availableLevels = [ + { + number: 1, + tag: 'H1', + svg: '', + }, + { + number: 2, + tag: 'H2', + svg: '', + }, + { + number: 3, + tag: 'H3', + svg: '', + }, + { + number: 4, + tag: 'H4', + svg: '', + }, + { + number: 5, + tag: 'H5', + svg: '', + }, + { + number: 6, + tag: 'H6', + svg: '', + }, + ]; + + return this._settings.levels ? availableLevels.filter( + l => this._settings.levels.includes(l.number) + ) : availableLevels; + } + + onPaste(event) { + const content = event.detail.data; + + let level = this.defaultLevel.number; + + switch (content.tagName) { + case 'H1': + level = 1; + break; + case 'H2': + level = 2; + break; + case 'H3': + level = 3; + break; + case 'H4': + level = 4; + break; + case 'H5': + level = 5; + break; + case 'H6': + level = 6; + break; + } + + if (this._settings.levels) { + // Fallback to nearest level when specified not available + level = this._settings.levels.reduce((prevLevel, currLevel) => { + return Math.abs(currLevel - level) < Math.abs(prevLevel - level) ? currLevel : prevLevel; + }); + } + + this.data = { + level, + text: content.innerHTML, + }; + } + + static get pasteConfig() { + return { + tags: ['H1', 'H2', 'H3', 'H4', 'H5', 'H6'], + }; + } + + static get toolbox() { + return { + icon: '', + title: 'Heading', + }; + } +} \ No newline at end of file diff --git a/frappe/public/js/frappe/wiki_blocks/blank.js b/frappe/public/js/frappe/wiki_blocks/spacer.js similarity index 97% rename from frappe/public/js/frappe/wiki_blocks/blank.js rename to frappe/public/js/frappe/wiki_blocks/spacer.js index 761bd2d9e9..6ec33adcc2 100644 --- a/frappe/public/js/frappe/wiki_blocks/blank.js +++ b/frappe/public/js/frappe/wiki_blocks/spacer.js @@ -1,7 +1,7 @@ -export default class Blank { +export default class Spacer { static get toolbox() { return { - title: 'Blank', + title: 'Spacer', icon: '' }; } @@ -25,7 +25,7 @@ export default class Blank { render() { this.wrapper = document.createElement('div'); if (!this.readOnly) { - this.wrapper.innerText = 'Blank'; + this.wrapper.innerText = 'Spacer'; this.wrapper.classList.add('widget', 'new-widget'); this.wrapper.style.minHeight = 50 + 'px'; } diff --git a/frappe/public/scss/desk/wiki.scss b/frappe/public/scss/desk/wiki.scss index e0a3727f4f..2ffdeaa15d 100644 --- a/frappe/public/scss/desk/wiki.scss +++ b/frappe/public/scss/desk/wiki.scss @@ -57,6 +57,17 @@ margin-bottom: 0 !important; } +.widget.header { + display: flex; + justify-content: center; + padding-left: 12px !important; + min-height: 65px; + box-shadow: none; + background-color: var(--control-bg); + color: var(--text-muted); + cursor: pointer; +} + .codex-editor { min-height: 630px; From 1b8fcfb62821105402a4368a82b1a61e55f14f20 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 20 May 2021 12:48:19 +0530 Subject: [PATCH 016/306] fix: Added Drag and delete button on Spacer and header --- frappe/public/js/frappe/wiki_blocks/card.js | 6 +- frappe/public/js/frappe/wiki_blocks/chart.js | 6 +- frappe/public/js/frappe/wiki_blocks/header.js | 59 +++++++++++++++---- .../public/js/frappe/wiki_blocks/paragraph.js | 8 +-- .../public/js/frappe/wiki_blocks/shortcut.js | 6 +- frappe/public/js/frappe/wiki_blocks/spacer.js | 48 +++++++++++++-- frappe/public/scss/desk/wiki.scss | 31 +++++++--- 7 files changed, 127 insertions(+), 37 deletions(-) diff --git a/frappe/public/js/frappe/wiki_blocks/card.js b/frappe/public/js/frappe/wiki_blocks/card.js index 5426fd24ce..64b685ca0a 100644 --- a/frappe/public/js/frappe/wiki_blocks/card.js +++ b/frappe/public/js/frappe/wiki_blocks/card.js @@ -56,7 +56,7 @@ export default class Card { } rendered() { - var e = this.wrapper.parentNode.parentNode; + var e = this.wrapper.closest('.ce-block'); e.classList.add("col-" + this.col); e.classList.add("pt-" + this.pt); e.classList.add("pr-" + this.pr); @@ -95,7 +95,7 @@ export default class Card { _getCol() { var e = 12; var t = "col-12"; - var n = this.wrapper.parentNode.parentNode; + var n = this.wrapper.closest('.ce-block'); var r = new RegExp(/\bcol-.+?\b/, "g"); if (n.className.match(r)) { n.classList.forEach(function (e) { @@ -111,7 +111,7 @@ export default class Card { var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; var t = 0; var n = "p" + e + "-0"; - var r = this.wrapper.parentNode.parentNode; + var r = this.wrapper.closest('.ce-block'); var a = new RegExp(/\pl-.+?\b/, "g"); var i = new RegExp(/\pr-.+?\b/, "g"); var o = new RegExp(/\pt-.+?\b/, "g"); diff --git a/frappe/public/js/frappe/wiki_blocks/chart.js b/frappe/public/js/frappe/wiki_blocks/chart.js index 6c51ad873e..27aca1b29b 100644 --- a/frappe/public/js/frappe/wiki_blocks/chart.js +++ b/frappe/public/js/frappe/wiki_blocks/chart.js @@ -56,7 +56,7 @@ export default class Chart { } rendered() { - var e = this.wrapper.parentNode.parentNode; + var e = this.wrapper.closest('.ce-block'); e.classList.add("col-" + this.col); e.classList.add("pt-" + this.pt); e.classList.add("pr-" + this.pr); @@ -95,7 +95,7 @@ export default class Chart { _getCol() { var e = 12; var t = "col-12"; - var n = this.wrapper.parentNode.parentNode; + var n = this.wrapper.closest('.ce-block'); var r = new RegExp(/\bcol-.+?\b/, "g"); if (n.className.match(r)) { n.classList.forEach(function (e) { @@ -111,7 +111,7 @@ export default class Chart { var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; var t = 0; var n = "p" + e + "-0"; - var r = this.wrapper.parentNode.parentNode; + var r = this.wrapper.closest('.ce-block'); var a = new RegExp(/\pl-.+?\b/, "g"); var i = new RegExp(/\pr-.+?\b/, "g"); var o = new RegExp(/\pt-.+?\b/, "g"); diff --git a/frappe/public/js/frappe/wiki_blocks/header.js b/frappe/public/js/frappe/wiki_blocks/header.js index f3da84a22f..e7b1b31229 100644 --- a/frappe/public/js/frappe/wiki_blocks/header.js +++ b/frappe/public/js/frappe/wiki_blocks/header.js @@ -43,13 +43,53 @@ export default class Header { } render() { + this.wrapper = document.createElement('div'); + this.wrapper.contentEditable = this.readOnly ? 'false' : 'true'; if (!this.readOnly) { - this._element.classList.add('widget', 'header'); - this._element.style.minHeight = 50 + 'px'; + let $widget_head = $(`
`) + let $widget_control = $(`
`) + + $widget_head[0].appendChild(this._element); + $widget_control.appendTo($widget_head); + $widget_head.appendTo(this.wrapper); + + this.wrapper.classList.add('widget', 'header'); + + this.add_custom_button( + frappe.utils.icon('delete', 'xs'), + () => this.api.blocks.delete(), + "delete-header", + `${__('Delete')}`, + null, + $widget_control + ); + + this.add_custom_button( + frappe.utils.icon('drag', 'xs'), + null, + "drag-handle", + `${__('Drag')}`, + null, + $widget_control + ); + + return this.wrapper; } return this._element; } + add_custom_button(html, action, class_name = "", title="", btn_type, wrapper) { + if (!btn_type) btn_type = 'btn-secondary'; + let button = $( + `` + ); + button.click(event => { + event.stopPropagation(); + action && action(); + }); + button.appendTo(wrapper); + } + renderSettings() { const holder = document.createElement('DIV'); @@ -108,7 +148,7 @@ export default class Header { save(toolsContent) { return { - text: toolsContent.innerHTML, + text: toolsContent.innerText, level: this.currentLevel.number, col: this._getCol(), pt: this._getPadding("t"), @@ -119,7 +159,7 @@ export default class Header { } rendered() { - var e = this._element.parentNode.parentNode; + var e = this._element.closest('.ce-block'); e.classList.add("col-" + this.col); e.classList.add("pt-" + this.pt); e.classList.add("pr-" + this.pr); @@ -130,7 +170,7 @@ export default class Header { _getCol() { var e = 12; var t = "col-12"; - var n = this._element.parentNode.parentNode; + var n = this._element.closest('.ce-block'); var r = new RegExp(/\bcol-.+?\b/, "g"); if (n.className.match(r)) { n.classList.forEach(function (e) { @@ -146,7 +186,7 @@ export default class Header { var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; var t = 0; var n = "p" + e + "-0"; - var r = this._element.parentNode.parentNode; + var r = this._element.closest('.ce-block'); var a = new RegExp(/\pl-.+?\b/, "g"); var i = new RegExp(/\pr-.+?\b/, "g"); var o = new RegExp(/\pt-.+?\b/, "g"); @@ -224,9 +264,8 @@ export default class Header { this._element.innerHTML = this._data.text || ''; } - if (!this.readOnly) { - this._element.classList.add('widget', 'header'); - this._element.style.minHeight = 50 + 'px'; + if (!this.readOnly && this.wrapper) { + this.wrapper.classList.add('widget', 'header'); } } @@ -237,8 +276,6 @@ export default class Header { tag.classList.add(this._CSS.wrapper); - tag.contentEditable = this.readOnly ? 'false' : 'true'; - tag.dataset.placeholder = this.api.i18n.t(this._settings.placeholder || ''); return tag; diff --git a/frappe/public/js/frappe/wiki_blocks/paragraph.js b/frappe/public/js/frappe/wiki_blocks/paragraph.js index e80d300ec3..bf246c7587 100644 --- a/frappe/public/js/frappe/wiki_blocks/paragraph.js +++ b/frappe/public/js/frappe/wiki_blocks/paragraph.js @@ -78,7 +78,7 @@ export default class Paragraph { save(toolsContent) { return { - text: toolsContent.innerHTML, + text: toolsContent.innerText, col: this._getCol(), pt: this._getPadding("t"), pr: this._getPadding("r"), @@ -88,7 +88,7 @@ export default class Paragraph { } rendered() { - var e = this._element.parentNode.parentNode; + var e = this._element.closest('.ce-block'); e.classList.add("col-" + this.col); e.classList.add("pt-" + this.pt); e.classList.add("pr-" + this.pr); @@ -99,7 +99,7 @@ export default class Paragraph { _getCol() { var e = 12; var t = "col-12"; - var n = this._element.parentNode.parentNode; + var n = this._element.closest('.ce-block'); var r = new RegExp(/\bcol-.+?\b/, "g"); if (n.className.match(r)) { n.classList.forEach(function (e) { @@ -115,7 +115,7 @@ export default class Paragraph { var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; var t = 0; var n = "p" + e + "-0"; - var r = this._element.parentNode.parentNode; + var r = this._element.closest('.ce-block'); var a = new RegExp(/\pl-.+?\b/, "g"); var i = new RegExp(/\pr-.+?\b/, "g"); var o = new RegExp(/\pt-.+?\b/, "g"); diff --git a/frappe/public/js/frappe/wiki_blocks/shortcut.js b/frappe/public/js/frappe/wiki_blocks/shortcut.js index ba98cbc382..b4f59ec3e5 100644 --- a/frappe/public/js/frappe/wiki_blocks/shortcut.js +++ b/frappe/public/js/frappe/wiki_blocks/shortcut.js @@ -55,7 +55,7 @@ export default class Shortcut { } rendered() { - var e = this.wrapper.parentNode.parentNode; + var e = this.wrapper.closest('.ce-block'); e.classList.add("col-" + this.col); e.classList.add("pt-" + this.pt); e.classList.add("pr-" + this.pr); @@ -94,7 +94,7 @@ export default class Shortcut { _getCol() { var e = 12; var t = "col-12"; - var n = this.wrapper.parentNode.parentNode; + var n = this.wrapper.closest('.ce-block'); var r = new RegExp(/\bcol-.+?\b/, "g"); if (n.className.match(r)) { n.classList.forEach(function (e) { @@ -110,7 +110,7 @@ export default class Shortcut { var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; var t = 0; var n = "p" + e + "-0"; - var r = this.wrapper.parentNode.parentNode; + var r = this.wrapper.closest('.ce-block'); var a = new RegExp(/\pl-.+?\b/, "g"); var i = new RegExp(/\pr-.+?\b/, "g"); var o = new RegExp(/\pt-.+?\b/, "g"); diff --git a/frappe/public/js/frappe/wiki_blocks/spacer.js b/frappe/public/js/frappe/wiki_blocks/spacer.js index 6ec33adcc2..aa51d234c8 100644 --- a/frappe/public/js/frappe/wiki_blocks/spacer.js +++ b/frappe/public/js/frappe/wiki_blocks/spacer.js @@ -25,13 +25,53 @@ export default class Spacer { render() { this.wrapper = document.createElement('div'); if (!this.readOnly) { - this.wrapper.innerText = 'Spacer'; + let $spacer = $(` +
+
+
Spacer
+
+
+ `) + $spacer.appendTo(this.wrapper); + this.wrapper.classList.add('widget', 'new-widget'); this.wrapper.style.minHeight = 50 + 'px'; + + let $widget_control = $spacer.find('.widget-control') + + this.add_custom_button( + frappe.utils.icon('delete', 'xs'), + () => this.api.blocks.delete(), + "delete-spacer", + `${__('Delete')}`, + null, + $widget_control + ); + + this.add_custom_button( + frappe.utils.icon('drag', 'xs'), + null, + "drag-handle", + `${__('Drag')}`, + null, + $widget_control + ); } return this.wrapper; } + add_custom_button(html, action, class_name = "", title="", btn_type, wrapper) { + if (!btn_type) btn_type = 'btn-secondary'; + let button = $( + `` + ); + button.click(event => { + event.stopPropagation(); + action && action(); + }); + button.appendTo(wrapper); + } + save() { return { col: this._getCol(), @@ -43,7 +83,7 @@ export default class Spacer { } rendered() { - var e = this.wrapper.parentNode.parentNode; + var e = this.wrapper.closest('.ce-block'); e.classList.add("col-" + this.col); e.classList.add("pt-" + this.pt); e.classList.add("pr-" + this.pr); @@ -54,7 +94,7 @@ export default class Spacer { _getCol() { var e = 12; var t = "col-12"; - var n = this.wrapper.parentNode.parentNode; + var n = this.wrapper.closest('.ce-block'); var r = new RegExp(/\bcol-.+?\b/, "g"); if (n.className.match(r)) { n.classList.forEach(function (e) { @@ -70,7 +110,7 @@ export default class Spacer { var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; var t = 0; var n = "p" + e + "-0"; - var r = this.wrapper.parentNode.parentNode; + var r = this.wrapper.closest('.ce-block'); var a = new RegExp(/\pl-.+?\b/, "g"); var i = new RegExp(/\pr-.+?\b/, "g"); var o = new RegExp(/\pt-.+?\b/, "g"); diff --git a/frappe/public/scss/desk/wiki.scss b/frappe/public/scss/desk/wiki.scss index 2ffdeaa15d..049fa456cf 100644 --- a/frappe/public/scss/desk/wiki.scss +++ b/frappe/public/scss/desk/wiki.scss @@ -55,17 +55,30 @@ .ce-header { padding: 0 !important; margin-bottom: 0 !important; + flex: 1; } -.widget.header { - display: flex; - justify-content: center; - padding-left: 12px !important; - min-height: 65px; - box-shadow: none; - background-color: var(--control-bg); - color: var(--text-muted); - cursor: pointer; +.widget{ + &.header { + display: flex; + justify-content: center; + flex: 1; + padding-left: 15px !important; + padding-right: 15px !important; + min-height: 50px; + box-shadow: none; + background-color: var(--control-bg); + color: var(--text-muted); + cursor: pointer; + + &:focus { + outline: none; + } + } + + &.new-widget { + align-items: inherit; + } } .codex-editor { From 519394a84cedde95d2bcbf14eaaa37190b8cdbe0 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 20 May 2021 16:56:17 +0530 Subject: [PATCH 017/306] fix: Added Drag and delete button for Paragraph --- .../public/js/frappe/wiki_blocks/paragraph.js | 43 +++++++++++++++++++ frappe/public/scss/desk/wiki.scss | 25 ++++++++--- 2 files changed, 63 insertions(+), 5 deletions(-) diff --git a/frappe/public/js/frappe/wiki_blocks/paragraph.js b/frappe/public/js/frappe/wiki_blocks/paragraph.js index bf246c7587..9bcc7023c7 100644 --- a/frappe/public/js/frappe/wiki_blocks/paragraph.js +++ b/frappe/public/js/frappe/wiki_blocks/paragraph.js @@ -57,9 +57,52 @@ export default class Paragraph { } render() { + this.wrapper = document.createElement('div'); + this.wrapper.contentEditable = this.readOnly ? 'false' : 'true'; + if (!this.readOnly) { + let $para_control = $(`
`) + + this.wrapper.appendChild(this._element); + this._element.classList.remove('widget'); + $para_control.appendTo(this.wrapper); + + this.wrapper.classList.add('widget'); + + this.add_custom_button( + frappe.utils.icon('delete', 'xs'), + () => this.api.blocks.delete(), + "delete-paragraph", + `${__('Delete')}`, + null, + $para_control + ); + + this.add_custom_button( + frappe.utils.icon('drag', 'xs'), + null, + "drag-handle", + `${__('Drag')}`, + null, + $para_control + ); + + return this.wrapper; + } return this._element; } + add_custom_button(html, action, class_name = "", title="", btn_type, wrapper) { + if (!btn_type) btn_type = 'btn-secondary'; + let button = $( + `` + ); + button.click(event => { + event.stopPropagation(); + action && action(); + }); + button.appendTo(wrapper); + } + merge(data) { let newData = { text: this.data.text + data.text diff --git a/frappe/public/scss/desk/wiki.scss b/frappe/public/scss/desk/wiki.scss index 049fa456cf..7b20b29598 100644 --- a/frappe/public/scss/desk/wiki.scss +++ b/frappe/public/scss/desk/wiki.scss @@ -69,16 +69,31 @@ box-shadow: none; background-color: var(--control-bg); color: var(--text-muted); - cursor: pointer; - - &:focus { - outline: none; - } } + &:focus { + outline: none; + } + &.new-widget { align-items: inherit; } + + .paragraph-control { + display: flex; + flex-direction: row-reverse; + position: absolute; + right: 20px; + gap: 5px; + background-color: var(--card-bg); + padding-left: 5px; + + .drag-handle { + cursor: all-scroll; + cursor: -webkit-grabbing; + } + } + } .codex-editor { From 6339b0f2728407c63c8734cfb6e90bc26db1e4b3 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 20 May 2021 17:00:56 +0530 Subject: [PATCH 018/306] fix: sider fix --- frappe/public/js/frappe/views/wiki.js | 4 ++-- frappe/public/js/frappe/wiki_blocks/header.js | 8 ++++---- frappe/public/js/frappe/wiki_blocks/paragraph.js | 2 +- frappe/public/js/frappe/wiki_blocks/spacer.js | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index 165371e10c..d994cb97af 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -319,10 +319,10 @@ frappe.views.Wiki = class Wiki { delete_page(name) { if (!this.deleted_sidebar_items.includes(name)) { - this.deleted_sidebar_items.push(name) + this.deleted_sidebar_items.push(name); } frappe.confirm(__("Are you sure you want to delete page {0}?", [name]), () => { - this.sidebar.find(`.standard-sidebar-section [item-name="${name}"]`).addClass('hidden') + this.sidebar.find(`.standard-sidebar-section [item-name="${name}"]`).addClass('hidden'); }); } diff --git a/frappe/public/js/frappe/wiki_blocks/header.js b/frappe/public/js/frappe/wiki_blocks/header.js index e7b1b31229..574a455e44 100644 --- a/frappe/public/js/frappe/wiki_blocks/header.js +++ b/frappe/public/js/frappe/wiki_blocks/header.js @@ -46,13 +46,13 @@ export default class Header { this.wrapper = document.createElement('div'); this.wrapper.contentEditable = this.readOnly ? 'false' : 'true'; if (!this.readOnly) { - let $widget_head = $(`
`) - let $widget_control = $(`
`) + let $widget_head = $(`
`); + let $widget_control = $(`
`); $widget_head[0].appendChild(this._element); $widget_control.appendTo($widget_head); $widget_head.appendTo(this.wrapper); - + this.wrapper.classList.add('widget', 'header'); this.add_custom_button( @@ -300,7 +300,7 @@ export default class Header { if (userSpecified) { return userSpecified; } else { - console.warn('(ง\'̀-\'́)ง Heading Tool: the default level specified was not found in available levels'); + // console.warn('(ง\'̀-\'́)ง Heading Tool: the default level specified was not found in available levels'); } } diff --git a/frappe/public/js/frappe/wiki_blocks/paragraph.js b/frappe/public/js/frappe/wiki_blocks/paragraph.js index 9bcc7023c7..558cf5a182 100644 --- a/frappe/public/js/frappe/wiki_blocks/paragraph.js +++ b/frappe/public/js/frappe/wiki_blocks/paragraph.js @@ -60,7 +60,7 @@ export default class Paragraph { this.wrapper = document.createElement('div'); this.wrapper.contentEditable = this.readOnly ? 'false' : 'true'; if (!this.readOnly) { - let $para_control = $(`
`) + let $para_control = $(`
`); this.wrapper.appendChild(this._element); this._element.classList.remove('widget'); diff --git a/frappe/public/js/frappe/wiki_blocks/spacer.js b/frappe/public/js/frappe/wiki_blocks/spacer.js index aa51d234c8..a5a686df2f 100644 --- a/frappe/public/js/frappe/wiki_blocks/spacer.js +++ b/frappe/public/js/frappe/wiki_blocks/spacer.js @@ -31,13 +31,13 @@ export default class Spacer {
Spacer
- `) + `); $spacer.appendTo(this.wrapper); this.wrapper.classList.add('widget', 'new-widget'); this.wrapper.style.minHeight = 50 + 'px'; - let $widget_control = $spacer.find('.widget-control') + let $widget_control = $spacer.find('.widget-control'); this.add_custom_button( frappe.utils.icon('delete', 'xs'), @@ -47,7 +47,7 @@ export default class Spacer { null, $widget_control ); - + this.add_custom_button( frappe.utils.icon('drag', 'xs'), null, From a1ad85a9cf284086d265dc4e20b8fa22110bcb27 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 20 May 2021 21:41:29 +0530 Subject: [PATCH 019/306] fix: show & hide sidebar controls --- frappe/public/js/frappe/views/wiki.js | 7 +++---- frappe/public/scss/desk/wiki.scss | 29 +++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index d994cb97af..cbc6eacf33 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -282,15 +282,14 @@ frappe.views.Wiki = class Wiki { } show_sidebar_actions() { - $('.sidebar-item-control .drag-handle').removeClass('hidden'); - $('.sidebar-item-control .delete-page').removeClass('hidden'); + this.sidebar.find('.standard-sidebar-section').addClass('show-control'); } add_sidebar_actions(item, sidebar_control) { this.add_custom_button( frappe.utils.icon('drag', 'xs'), null, - "drag-handle hidden", + "drag-handle", `${__('Drag')}`, null, sidebar_control @@ -298,7 +297,7 @@ frappe.views.Wiki = class Wiki { this.add_custom_button( frappe.utils.icon('delete', 'xs'), () => this.delete_page(item.name), - "delete-page hidden", + "delete-page", `${__('Delete')}`, null, sidebar_control diff --git a/frappe/public/scss/desk/wiki.scss b/frappe/public/scss/desk/wiki.scss index 7b20b29598..1a5f9376f9 100644 --- a/frappe/public/scss/desk/wiki.scss +++ b/frappe/public/scss/desk/wiki.scss @@ -25,6 +25,11 @@ .drag-handle { cursor: all-scroll; cursor: -webkit-grabbing; + display: none; + } + + .delete-page { + display: none; } svg { @@ -50,6 +55,30 @@ overflow: hidden; flex: 1; } + + .standard-sidebar-section.show-control { + .desk-sidebar-item.standard-sidebar-item { + &:hover { + .drag-handle { + display: inline-block; + } + + .delete-page { + display: inline-block; + } + } + + &.selected { + .drag-handle { + display: inline-block; + } + + .delete-page { + display: inline-block; + } + } + } + } } .ce-header { From 8294ee685d1b49165d041863d8ccd4a853d0fbc5 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Mon, 24 May 2021 12:42:18 +0530 Subject: [PATCH 020/306] fix: Tune button implemented on each block --- frappe/public/js/frappe/wiki_blocks/card.js | 36 +++++++++++++++++++ frappe/public/js/frappe/wiki_blocks/chart.js | 36 +++++++++++++++++++ frappe/public/js/frappe/wiki_blocks/header.js | 30 +++++++++++++--- .../public/js/frappe/wiki_blocks/paragraph.js | 30 +++++++++++++--- .../public/js/frappe/wiki_blocks/shortcut.js | 35 ++++++++++++++++++ frappe/public/js/frappe/wiki_blocks/spacer.js | 30 +++++++++++++--- frappe/public/scss/desk/wiki.scss | 12 +++++++ 7 files changed, 194 insertions(+), 15 deletions(-) diff --git a/frappe/public/js/frappe/wiki_blocks/card.js b/frappe/public/js/frappe/wiki_blocks/card.js index 64b685ca0a..81fdf0e08c 100644 --- a/frappe/public/js/frappe/wiki_blocks/card.js +++ b/frappe/public/js/frappe/wiki_blocks/card.js @@ -40,9 +40,45 @@ export default class Card { if (this.data && this.data.card_name) { this._make_cards(this.data.card_name); } + + if (!this.readOnly) { + let $widget_control = $(this.wrapper).find('.widget-control'); + this.add_custom_button( + frappe.utils.icon('dot-vertical', 'xs'), + (event) => { + let evn = event; + !$('.ce-settings.ce-settings--opened').length && + setTimeout(() => { + this.api.toolbar.toggleBlockSettings(); + var position = $(evn.target).offset(); + $('.ce-settings.ce-settings--opened').offset({ + top: position.top + 25, + left: position.left - 77 + }); + }, 50) + }, + "tune-btn", + `${__('Tune')}`, + null, + $widget_control + ); + } + return this.wrapper; } + add_custom_button(html, action, class_name = "", title="", btn_type, wrapper) { + if (!btn_type) btn_type = 'btn-secondary'; + let button = $( + `` + ); + button.click(event => { + event.stopPropagation(); + action && action(event); + }); + wrapper.prepend(button); + } + save(blockContent) { return { card_name: blockContent.getAttribute('card_name'), diff --git a/frappe/public/js/frappe/wiki_blocks/chart.js b/frappe/public/js/frappe/wiki_blocks/chart.js index 27aca1b29b..d6629c81bd 100644 --- a/frappe/public/js/frappe/wiki_blocks/chart.js +++ b/frappe/public/js/frappe/wiki_blocks/chart.js @@ -40,9 +40,45 @@ export default class Chart { if (this.data && this.data.chart_name) { this._make_charts(this.data.chart_name); } + + if (!this.readOnly) { + let $widget_control = $(this.wrapper).find('.widget-control'); + this.add_custom_button( + frappe.utils.icon('dot-vertical', 'xs'), + (event) => { + let evn = event; + !$('.ce-settings.ce-settings--opened').length && + setTimeout(() => { + this.api.toolbar.toggleBlockSettings(); + var position = $(evn.target).offset(); + $('.ce-settings.ce-settings--opened').offset({ + top: position.top + 25, + left: position.left - 77 + }); + }, 50) + }, + "tune-btn", + `${__('Tune')}`, + null, + $widget_control + ); + } + return this.wrapper; } + add_custom_button(html, action, class_name = "", title="", btn_type, wrapper) { + if (!btn_type) btn_type = 'btn-secondary'; + let button = $( + `` + ); + button.click(event => { + event.stopPropagation(); + action && action(event); + }); + wrapper.prepend(button); + } + save(blockContent) { return { chart_name: blockContent.getAttribute('chart_name'), diff --git a/frappe/public/js/frappe/wiki_blocks/header.js b/frappe/public/js/frappe/wiki_blocks/header.js index 574a455e44..ef6283a808 100644 --- a/frappe/public/js/frappe/wiki_blocks/header.js +++ b/frappe/public/js/frappe/wiki_blocks/header.js @@ -56,10 +56,21 @@ export default class Header { this.wrapper.classList.add('widget', 'header'); this.add_custom_button( - frappe.utils.icon('delete', 'xs'), - () => this.api.blocks.delete(), - "delete-header", - `${__('Delete')}`, + frappe.utils.icon('dot-vertical', 'xs'), + (event) => { + let evn = event; + !$('.ce-settings.ce-settings--opened').length && + setTimeout(() => { + this.api.toolbar.toggleBlockSettings(); + var position = $(evn.target).offset(); + $('.ce-settings.ce-settings--opened').offset({ + top: position.top + 25, + left: position.left - 77 + }); + }, 50) + }, + "tune-btn", + `${__('Tune')}`, null, $widget_control ); @@ -73,6 +84,15 @@ export default class Header { $widget_control ); + this.add_custom_button( + frappe.utils.icon('delete', 'xs'), + () => this.api.blocks.delete(), + "delete-header", + `${__('Delete')}`, + null, + $widget_control + ); + return this.wrapper; } return this._element; @@ -85,7 +105,7 @@ export default class Header { ); button.click(event => { event.stopPropagation(); - action && action(); + action && action(event); }); button.appendTo(wrapper); } diff --git a/frappe/public/js/frappe/wiki_blocks/paragraph.js b/frappe/public/js/frappe/wiki_blocks/paragraph.js index 558cf5a182..dac3dc9d1b 100644 --- a/frappe/public/js/frappe/wiki_blocks/paragraph.js +++ b/frappe/public/js/frappe/wiki_blocks/paragraph.js @@ -69,10 +69,21 @@ export default class Paragraph { this.wrapper.classList.add('widget'); this.add_custom_button( - frappe.utils.icon('delete', 'xs'), - () => this.api.blocks.delete(), - "delete-paragraph", - `${__('Delete')}`, + frappe.utils.icon('dot-vertical', 'xs'), + (event) => { + let evn = event; + !$('.ce-settings.ce-settings--opened').length && + setTimeout(() => { + this.api.toolbar.toggleBlockSettings(); + var position = $(evn.target).offset(); + $('.ce-settings.ce-settings--opened').offset({ + top: position.top + 25, + left: position.left - 77 + }); + }, 50) + }, + "tune-btn", + `${__('Tune')}`, null, $para_control ); @@ -86,6 +97,15 @@ export default class Paragraph { $para_control ); + this.add_custom_button( + frappe.utils.icon('delete', 'xs'), + () => this.api.blocks.delete(), + "delete-paragraph", + `${__('Delete')}`, + null, + $para_control + ); + return this.wrapper; } return this._element; @@ -98,7 +118,7 @@ export default class Paragraph { ); button.click(event => { event.stopPropagation(); - action && action(); + action && action(event); }); button.appendTo(wrapper); } diff --git a/frappe/public/js/frappe/wiki_blocks/shortcut.js b/frappe/public/js/frappe/wiki_blocks/shortcut.js index b4f59ec3e5..453113d5c6 100644 --- a/frappe/public/js/frappe/wiki_blocks/shortcut.js +++ b/frappe/public/js/frappe/wiki_blocks/shortcut.js @@ -39,9 +39,44 @@ export default class Shortcut { if (this.data && this.data.shortcut_name) { this._make_shortcuts(this.data.shortcut_name); } + + if (!this.readOnly) { + let $widget_control = $(this.wrapper).find('.widget-control'); + this.add_custom_button( + frappe.utils.icon('dot-vertical', 'xs'), + (event) => { + let evn = event; + !$('.ce-settings.ce-settings--opened').length && + setTimeout(() => { + this.api.toolbar.toggleBlockSettings(); + var position = $(evn.target).offset(); + $('.ce-settings.ce-settings--opened').offset({ + top: position.top + 25, + left: position.left - 77 + }); + }, 50) + }, + "tune-btn", + `${__('Tune')}`, + null, + $widget_control + ); + } return this.wrapper; } + add_custom_button(html, action, class_name = "", title="", btn_type, wrapper) { + if (!btn_type) btn_type = 'btn-secondary'; + let button = $( + `` + ); + button.click(event => { + event.stopPropagation(); + action && action(event); + }); + wrapper.prepend(button); + } + save(blockContent) { return { shortcut_name: blockContent.getAttribute('shortcut_name'), diff --git a/frappe/public/js/frappe/wiki_blocks/spacer.js b/frappe/public/js/frappe/wiki_blocks/spacer.js index a5a686df2f..8282db9455 100644 --- a/frappe/public/js/frappe/wiki_blocks/spacer.js +++ b/frappe/public/js/frappe/wiki_blocks/spacer.js @@ -40,10 +40,21 @@ export default class Spacer { let $widget_control = $spacer.find('.widget-control'); this.add_custom_button( - frappe.utils.icon('delete', 'xs'), - () => this.api.blocks.delete(), - "delete-spacer", - `${__('Delete')}`, + frappe.utils.icon('dot-vertical', 'xs'), + (event) => { + let evn = event; + !$('.ce-settings.ce-settings--opened').length && + setTimeout(() => { + this.api.toolbar.toggleBlockSettings(); + var position = $(evn.target).offset(); + $('.ce-settings.ce-settings--opened').offset({ + top: position.top + 25, + left: position.left - 77 + }); + }, 50) + }, + "tune-btn", + `${__('Tune')}`, null, $widget_control ); @@ -56,6 +67,15 @@ export default class Spacer { null, $widget_control ); + + this.add_custom_button( + frappe.utils.icon('delete', 'xs'), + () => this.api.blocks.delete(), + "delete-spacer", + `${__('Delete')}`, + null, + $widget_control + ); } return this.wrapper; } @@ -67,7 +87,7 @@ export default class Spacer { ); button.click(event => { event.stopPropagation(); - action && action(); + action && action(event); }); button.appendTo(wrapper); } diff --git a/frappe/public/scss/desk/wiki.scss b/frappe/public/scss/desk/wiki.scss index 1a5f9376f9..1db2c451a6 100644 --- a/frappe/public/scss/desk/wiki.scss +++ b/frappe/public/scss/desk/wiki.scss @@ -81,6 +81,18 @@ } } +.ce-settings { + width: fit-content; +} + +.tune-btn > * { + pointer-events: none; +} + +.ce-toolbar__settings-btn { + display: none; +} + .ce-header { padding: 0 !important; margin-bottom: 0 !important; From 363b646d02c4dae3fcc1ab5a1068797ed7277151 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Mon, 24 May 2021 16:44:04 +0530 Subject: [PATCH 021/306] fix: Miscellaneous changes --- frappe/public/js/frappe/views/wiki.js | 67 +++--- frappe/public/js/frappe/wiki_blocks/card.js | 4 +- frappe/public/js/frappe/wiki_blocks/chart.js | 4 +- frappe/public/js/frappe/wiki_blocks/header.js | 4 +- .../public/js/frappe/wiki_blocks/paragraph.js | 4 +- .../public/js/frappe/wiki_blocks/shortcut.js | 4 +- frappe/public/js/frappe/wiki_blocks/spacer.js | 4 +- frappe/public/scss/desk/wiki.scss | 219 +++++++++--------- 8 files changed, 155 insertions(+), 155 deletions(-) diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index cbc6eacf33..22036a8d2d 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -15,6 +15,37 @@ frappe.views.Wiki = class Wiki { this.new_page = null; this.prepare_container(); this.setup_wiki_pages(); + + this.tools = { + header: { + class: frappe.wiki_block.blocks['header'], + inlineToolbar: true + }, + paragraph: { + class: frappe.wiki_block.blocks['paragraph'], + inlineToolbar: true + }, + chart: { + class: frappe.wiki_block.blocks['chart'], + config: { + page_data: this.page_data || [] + } + }, + card: { + class: frappe.wiki_block.blocks['card'], + config: { + page_data: this.page_data || [] + } + }, + shortcut: { + class: frappe.wiki_block.blocks['shortcut'], + config: { + page_data: this.page_data || [] + } + }, + spacer: frappe.wiki_block.blocks['spacer'], + spacingTune: frappe.wiki_block.tunes['spacing_tune'], + }; } prepare_container() { @@ -99,6 +130,11 @@ frappe.views.Wiki = class Wiki { }; const make_sidebar_child_item = item => { + + if (frappe.router.slug(item.name) == this.get_page_to_show() || item.name == this.new_page) { + child_item_section.classList.toggle("hidden"); + } + let $child_item = get_child_item(item); let sidebar_control = $child_item.find('.sidebar-item-control'); this.add_sidebar_actions(item, sidebar_control); @@ -146,36 +182,6 @@ frappe.views.Wiki = class Wiki { this.get_content(page).then(() => { this.get_data(page).then(() => { if (this.content) { - this.tools = { - header: { - class: frappe.wiki_block.blocks['header'], - inlineToolbar: true - }, - paragraph: { - class: frappe.wiki_block.blocks['paragraph'], - inlineToolbar: true - }, - chart: { - class: frappe.wiki_block.blocks['chart'], - config: { - page_data: this.page_data || [] - } - }, - card: { - class: frappe.wiki_block.blocks['card'], - config: { - page_data: this.page_data || [] - } - }, - shortcut: { - class: frappe.wiki_block.blocks['shortcut'], - config: { - page_data: this.page_data || [] - } - }, - spacer: frappe.wiki_block.blocks['spacer'], - spacingTune: frappe.wiki_block.tunes['spacing_tune'], - }; if (this.editor) { this.editor.isReady.then(() => { this.editor.configuration.tools.chart.config.page_data = this.page_data; @@ -258,6 +264,7 @@ frappe.views.Wiki = class Wiki { } setup_actions() { + if (!this.isReadOnly) return; this.page.clear_inner_toolbar(); this.page.set_secondary_action( __("Customize"), diff --git a/frappe/public/js/frappe/wiki_blocks/card.js b/frappe/public/js/frappe/wiki_blocks/card.js index 81fdf0e08c..820056a6ab 100644 --- a/frappe/public/js/frappe/wiki_blocks/card.js +++ b/frappe/public/js/frappe/wiki_blocks/card.js @@ -44,7 +44,7 @@ export default class Card { if (!this.readOnly) { let $widget_control = $(this.wrapper).find('.widget-control'); this.add_custom_button( - frappe.utils.icon('dot-vertical', 'xs'), + frappe.utils.icon('dot-horizontal', 'xs'), (event) => { let evn = event; !$('.ce-settings.ce-settings--opened').length && @@ -55,7 +55,7 @@ export default class Card { top: position.top + 25, left: position.left - 77 }); - }, 50) + }, 50); }, "tune-btn", `${__('Tune')}`, diff --git a/frappe/public/js/frappe/wiki_blocks/chart.js b/frappe/public/js/frappe/wiki_blocks/chart.js index d6629c81bd..c7f92222c0 100644 --- a/frappe/public/js/frappe/wiki_blocks/chart.js +++ b/frappe/public/js/frappe/wiki_blocks/chart.js @@ -44,7 +44,7 @@ export default class Chart { if (!this.readOnly) { let $widget_control = $(this.wrapper).find('.widget-control'); this.add_custom_button( - frappe.utils.icon('dot-vertical', 'xs'), + frappe.utils.icon('dot-horizontal', 'xs'), (event) => { let evn = event; !$('.ce-settings.ce-settings--opened').length && @@ -55,7 +55,7 @@ export default class Chart { top: position.top + 25, left: position.left - 77 }); - }, 50) + }, 50); }, "tune-btn", `${__('Tune')}`, diff --git a/frappe/public/js/frappe/wiki_blocks/header.js b/frappe/public/js/frappe/wiki_blocks/header.js index ef6283a808..727f495a42 100644 --- a/frappe/public/js/frappe/wiki_blocks/header.js +++ b/frappe/public/js/frappe/wiki_blocks/header.js @@ -56,7 +56,7 @@ export default class Header { this.wrapper.classList.add('widget', 'header'); this.add_custom_button( - frappe.utils.icon('dot-vertical', 'xs'), + frappe.utils.icon('dot-horizontal', 'xs'), (event) => { let evn = event; !$('.ce-settings.ce-settings--opened').length && @@ -67,7 +67,7 @@ export default class Header { top: position.top + 25, left: position.left - 77 }); - }, 50) + }, 50); }, "tune-btn", `${__('Tune')}`, diff --git a/frappe/public/js/frappe/wiki_blocks/paragraph.js b/frappe/public/js/frappe/wiki_blocks/paragraph.js index dac3dc9d1b..cc05f3edbc 100644 --- a/frappe/public/js/frappe/wiki_blocks/paragraph.js +++ b/frappe/public/js/frappe/wiki_blocks/paragraph.js @@ -69,7 +69,7 @@ export default class Paragraph { this.wrapper.classList.add('widget'); this.add_custom_button( - frappe.utils.icon('dot-vertical', 'xs'), + frappe.utils.icon('dot-horizontal', 'xs'), (event) => { let evn = event; !$('.ce-settings.ce-settings--opened').length && @@ -80,7 +80,7 @@ export default class Paragraph { top: position.top + 25, left: position.left - 77 }); - }, 50) + }, 50); }, "tune-btn", `${__('Tune')}`, diff --git a/frappe/public/js/frappe/wiki_blocks/shortcut.js b/frappe/public/js/frappe/wiki_blocks/shortcut.js index 453113d5c6..c6d01a8800 100644 --- a/frappe/public/js/frappe/wiki_blocks/shortcut.js +++ b/frappe/public/js/frappe/wiki_blocks/shortcut.js @@ -43,7 +43,7 @@ export default class Shortcut { if (!this.readOnly) { let $widget_control = $(this.wrapper).find('.widget-control'); this.add_custom_button( - frappe.utils.icon('dot-vertical', 'xs'), + frappe.utils.icon('dot-horizontal', 'xs'), (event) => { let evn = event; !$('.ce-settings.ce-settings--opened').length && @@ -54,7 +54,7 @@ export default class Shortcut { top: position.top + 25, left: position.left - 77 }); - }, 50) + }, 50); }, "tune-btn", `${__('Tune')}`, diff --git a/frappe/public/js/frappe/wiki_blocks/spacer.js b/frappe/public/js/frappe/wiki_blocks/spacer.js index 8282db9455..5f26f06ca4 100644 --- a/frappe/public/js/frappe/wiki_blocks/spacer.js +++ b/frappe/public/js/frappe/wiki_blocks/spacer.js @@ -40,7 +40,7 @@ export default class Spacer { let $widget_control = $spacer.find('.widget-control'); this.add_custom_button( - frappe.utils.icon('dot-vertical', 'xs'), + frappe.utils.icon('dot-horizontal', 'xs'), (event) => { let evn = event; !$('.ce-settings.ce-settings--opened').length && @@ -51,7 +51,7 @@ export default class Spacer { top: position.top + 25, left: position.left - 77 }); - }, 50) + }, 50); }, "tune-btn", `${__('Tune')}`, diff --git a/frappe/public/scss/desk/wiki.scss b/frappe/public/scss/desk/wiki.scss index 1db2c451a6..cb911611d8 100644 --- a/frappe/public/scss/desk/wiki.scss +++ b/frappe/public/scss/desk/wiki.scss @@ -36,6 +36,16 @@ margin-right: 0; } } + + .sidebar-item-label { + flex: 1; + } + + .item-anchor { + display: flex; + overflow: hidden; + flex: 1; + } } .sidebar-child-item-container { @@ -46,16 +56,6 @@ } } - .sidebar-item-label { - flex: 1; - } - - .item-anchor { - display: flex; - overflow: hidden; - flex: 1; - } - .standard-sidebar-section.show-control { .desk-sidebar-item.standard-sidebar-item { &:hover { @@ -81,65 +81,86 @@ } } -.ce-settings { - width: fit-content; -} - -.tune-btn > * { - pointer-events: none; -} - -.ce-toolbar__settings-btn { - display: none; -} - -.ce-header { - padding: 0 !important; - margin-bottom: 0 !important; - flex: 1; -} +.codex-editor { + min-height: 630px; -.widget{ - &.header { + .codex-editor__redactor{ display: flex; - justify-content: center; - flex: 1; - padding-left: 15px !important; - padding-right: 15px !important; - min-height: 50px; - box-shadow: none; - background-color: var(--control-bg); - color: var(--text-muted); - } - - &:focus { - outline: none; - } + flex-wrap: wrap; + flex-direction: row; + margin: 0px -7px; + padding-bottom: 20px !important; - &.new-widget { - align-items: inherit; - } + .ce-block{ + width: 100%; + padding-left: 0; + padding-right: 0; + + &.ce-block--selected { + .ce-block__content { + background-color: inherit; + } + } + + .ce-block__content { + max-width: 100%; + height: 100%; + padding: 7px; + + &> div { + height: 100%; + } - .paragraph-control { - display: flex; - flex-direction: row-reverse; - position: absolute; - right: 20px; - gap: 5px; - background-color: var(--card-bg); - padding-left: 5px; + .tune-btn > * { + pointer-events: none; + } - .drag-handle { - cursor: all-scroll; - cursor: -webkit-grabbing; + .ce-header { + padding: 0 !important; + margin-bottom: 0 !important; + flex: 1; + } + + .widget{ + &.header { + display: flex; + justify-content: center; + flex: 1; + padding-left: 15px !important; + padding-right: 15px !important; + min-height: 50px; + box-shadow: none; + background-color: var(--control-bg); + color: var(--text-muted); + } + + &:focus { + outline: none; + } + + &.new-widget { + align-items: inherit; + } + + .paragraph-control { + display: flex; + flex-direction: row-reverse; + position: absolute; + right: 20px; + gap: 5px; + background-color: var(--card-bg); + padding-left: 5px; + + .drag-handle { + cursor: all-scroll; + cursor: -webkit-grabbing; + } + } + } + } } } -} - -.codex-editor { - min-height: 630px; - svg { fill: none; } @@ -153,6 +174,29 @@ stroke: none; width: fit-content; } + + .ce-settings { + width: fit-content; + + .cdx-settings-button.disabled{ + pointer-events: none; + opacity: .5 + } + .cdx-settings-sidebar{ + position: absolute; + right: 100%; + top:0; + background: #fff; + width: 108px; + height: 145px; + box-shadow: 0 3px 15px -3px rgba(13,20,33,.13); + border-radius: 0 4px 4px 0;z-index: 0; + } + } + + .ce-toolbar__settings-btn { + display: none; + } } .ce-inline-tool, .ce-inline-toolbar__dropdown { @@ -160,6 +204,7 @@ fill: currentColor; } } + @media (min-width: 1199px) { .ce-toolbar__content { max-width: 930px; @@ -190,57 +235,5 @@ max-width: 100%; } } - - div[card_name] { - height: inherit; - } - -} - -.codex-editor__redactor{ - display: flex; - flex-wrap: wrap; - flex-direction: row; - margin: 0px -7px; -} -.ce-block{ - width: 100%; - padding-left: 0; - padding-right: 0; -} -.cdx-settings-input{ - border: 1px solid rgba(201,201,204,.48); - -webkit-box-shadow: inset 0 1px 2px 0 rgba(35,44,72,.06); - box-shadow: inset 0 1px 2px 0 rgba(35,44,72,.06); - border-radius: 3px;padding: 3px 8px;outline: none; - width: 100%; - -webkit-box-sizing: border-box; - box-sizing: border-box; -} -.cdx-small{ - font-size: .6rem -} -.ce-block__content { - max-width: 100%; - height: 100%; - padding: 7px; - - &> div { - height: 100%; - } -} -.cdx-settings-button.disabled{ - pointer-events: none; - opacity: .5 -} -.cdx-settings-sidebar{ - position: absolute; - right: 100%; - top:0; - background: #fff; - width: 108px; - height: 145px; - box-shadow: 0 3px 15px -3px rgba(13,20,33,.13); - border-radius: 0 4px 4px 0;z-index: 0; } \ No newline at end of file From 3112d6d8431a6aa60d126fce23b892288769f61d Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 25 May 2021 20:42:55 +0530 Subject: [PATCH 022/306] fix: Sidebar Child Item Draggable & minor fixes --- .../internal_wiki_page/internal_wiki_page.py | 6 +- frappe/public/icons/timeless/symbol-defs.svg | 3 + frappe/public/js/frappe/views/wiki.js | 168 ++++++++---------- frappe/public/scss/desk/wiki.scss | 19 +- package.json | 2 +- yarn.lock | 8 +- 6 files changed, 104 insertions(+), 102 deletions(-) diff --git a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py index 3fba588343..a53473e1fe 100644 --- a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py +++ b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py @@ -35,10 +35,12 @@ def save_wiki_page(title, parent, sb_items, deleted_pages, new_widgets, blocks, doc.save() if json.loads(sb_items): - for d in json.loads(sb_items): + for seq, d in enumerate(json.loads(sb_items)): doc = frappe.get_doc('Internal Wiki Page', d.get('name')) - doc.sequence_id = d.get('sequence_id') + doc.sequence_id = seq + 1 + doc.parent_page = d.get('parent_page') or "" doc.save() + doc.title = title if json.loads(deleted_pages): for d in json.loads(deleted_pages): diff --git a/frappe/public/icons/timeless/symbol-defs.svg b/frappe/public/icons/timeless/symbol-defs.svg index 5e52336bfa..87d80eef03 100644 --- a/frappe/public/icons/timeless/symbol-defs.svg +++ b/frappe/public/icons/timeless/symbol-defs.svg @@ -57,6 +57,9 @@ + + + diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index 22036a8d2d..b0ec3c1882 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -86,11 +86,25 @@ frappe.views.Wiki = class Wiki { if (this.sidebar.find('.standard-sidebar-section')[0]) { this.sidebar.find('.standard-sidebar-section')[0].remove(); } - let sidebar_section = $(`
`); + let sidebar_section = $(`
`); + this.prepare_sidebar(items, sidebar_section, this.sidebar); + } + + prepare_sidebar(items, child_container, item_container) { + items.forEach(item => this.append_item(item, child_container)); + child_container.appendTo(item_container); + } + + append_item(item, container) { + let is_current_page = frappe.router.slug(item.name) == frappe.router.slug(this.get_page_to_show()) || item.name == this.new_page; + if (is_current_page) { + item.selected = true; + this.current_page_name = item.name; + } - const get_sidebar_item = function (item) { + const item_container = function (item) { return $(` -
+
-
`); }; - const make_sidebar_category_item = item => { - if (item.name == this.get_page_to_show()) { - item.selected = true; - this.current_page_name = item.name; - } - - const get_child_item = function (item) { - return $(` -
-
- - ${frappe.utils.icon(item.icon || "folder-normal", "md")} - ${item.label || item.name} - -
-
-
- `); - }; - - const make_sidebar_child_item = item => { - - if (frappe.router.slug(item.name) == this.get_page_to_show() || item.name == this.new_page) { - child_item_section.classList.toggle("hidden"); - } + let $item_container = item_container(item); + let sidebar_control = $item_container.find('.sidebar-item-control'); - let $child_item = get_child_item(item); - let sidebar_control = $child_item.find('.sidebar-item-control'); - this.add_sidebar_actions(item, sidebar_control); - $child_item.appendTo(child_item_section); - this.sidebar_items[item.name] = $child_item; - }; - - let $item = get_sidebar_item(item); - let sidebar_control = $item.find('.sidebar-item-control'); - this.add_sidebar_actions(item, sidebar_control); - let $drop_icon = $(``); - $drop_icon.appendTo(sidebar_control); - let drop_icon = $item.find('.drop-icon').get(0); - let child_item_section = $item.find('.sidebar-child-item').get(0); - if (this.all_pages.some(e => e.parent_page == item.name)) { - drop_icon.classList.remove('hidden'); - drop_icon.addEventListener('click', () => { - child_item_section.classList.toggle("hidden"); - }); - } + this.add_sidebar_actions(item, sidebar_control); - let child_items = this.all_pages.filter(page => page.parent_page == item.name); - child_items.forEach(item => make_sidebar_child_item(item)); + let child_items = this.all_pages.filter(page => page.parent_page == item.name); + if (child_items.length > 0) { + let child_container = $(``); + this.prepare_sidebar(child_items, child_container, $item_container); + } - $item.appendTo(sidebar_section); - this.sidebar_items[item.name] = $item; - }; + $item_container.appendTo(container); + this.sidebar_items[item.name] = $item_container; - items.forEach(item => make_sidebar_category_item(item)); + if ($item_container.parent().hasClass('hidden') && is_current_page) { + $item_container.parent().toggleClass('hidden'); + } - sidebar_section.appendTo(this.sidebar); + let $drop_icon = $(``); + $drop_icon.appendTo(sidebar_control); + let drop_icon = $item_container.find('.drop-icon').get(0); + let child_item_section = $item_container.find('.sidebar-child-item').get(0); + if (this.all_pages.some(e => e.parent_page == item.name)) { + drop_icon.classList.remove('hidden'); + drop_icon.addEventListener('click', () => { + child_item_section.classList.toggle("hidden"); + let icon = $(drop_icon).find("use").attr("href")==="#icon-small-down" ? "#icon-small-up" : "#icon-small-down"; + $(drop_icon).find("use").attr("href", icon); + }); + } } show() { @@ -275,6 +258,7 @@ frappe.views.Wiki = class Wiki { .then(() => { this.undo = new Undo({ editor: this.editor }); this.undo.initialize({blocks: JSON.parse(this.content)}); + this.undo.readOnly = false; this.setup_customization_buttons(); this.show_sidebar_actions(); this.make_sidebar_sortable(); @@ -334,27 +318,28 @@ frappe.views.Wiki = class Wiki { make_sidebar_sortable() { let me = this; - this.sidebar_sortable = Sortable.create(this.page.sidebar.find(".standard-sidebar-section").get(0), { - handle: ".drag-handle", - draggable: ".standard-sidebar-item-container", - animation: 150, - onEnd: function (evt) { - let new_sb_items = []; - let old_sb_items = me.all_pages.filter(page => page.parent_page == '' || page.parent_page == null); - for (let page of evt.srcElement.childNodes) { - new_sb_items.push({ - name: page.attributes['item-name'].value, - sequence_id: parseInt(page.attributes['item-sequence'].value) - }); - } - me.sorted_sidebar_items = []; - new_sb_items.forEach((old, index) => { - if (old.sequence_id != old_sb_items[index].sequence_id) { - old.sequence_id = old_sb_items[index].sequence_id; - me.sorted_sidebar_items.push(old); + $('.nested-container').each( function() { + new Sortable(this, { + handle: ".drag-handle", + draggable: ".sidebar-item-container", + group: 'nested', + animation: 150, + fallbackOnBody: true, + swapThreshold: 0.65, + onEnd: function (evt) { + me.sorted_sidebar_items = []; + for (let page of $('.standard-sidebar-section').find('.sidebar-item-container')) { + let parent_page = ""; + if (page.closest('.nested-container').classList.contains('sidebar-child-item')) { + parent_page = page.parentElement.parentElement.attributes["item-name"].value; + } + me.sorted_sidebar_items.push({ + name: page.attributes['item-name'].value, + parent_page: parent_page + }); } - }); - } + } + }); }); } @@ -383,11 +368,10 @@ frappe.views.Wiki = class Wiki { () => { this.page.clear_primary_action(); this.page.clear_secondary_action(); + this.undo.readOnly = true; this.save_page(); this.editor.readOnly.toggle(); this.isReadOnly = true; - this.page_sortable.option("disabled", true); - this.sidebar_sortable.option("disabled", true); }, null, __("Saving") @@ -400,8 +384,6 @@ frappe.views.Wiki = class Wiki { this.page.clear_secondary_action(); this.editor.readOnly.toggle(); this.isReadOnly = true; - this.page_sortable.option("disabled", true); - this.sidebar_sortable.option("disabled", true); this.deleted_sidebar_items = []; this.reload(); frappe.show_alert({ message: __("Customizations Discarded"), indicator: "info" }); @@ -413,8 +395,17 @@ frappe.views.Wiki = class Wiki { const d = new frappe.ui.Dialog({ title: __('Set Title'), fields: [ - { label: __('Title'), fieldtype: 'Data', fieldname: 'title'}, - { label: __('Parent'), fieldtype: 'Select', fieldname: 'parent', options: this.all_pages.map(pages => pages.name)} + { + label: __('Title'), + fieldtype: 'Data', + fieldname: 'title' + }, + { + label: __('Parent'), + fieldtype: 'Select', + fieldname: 'parent', + options: this.all_pages.filter(page => !page.parent_page).map(page => page.name) + } ], primary_action_label: __('Create'), primary_action: (values) => { @@ -439,7 +430,6 @@ frappe.views.Wiki = class Wiki { } this.make_sidebar_sortable(); this.make_blocks_sortable(); - this.dirty = false; }); } }); @@ -447,7 +437,6 @@ frappe.views.Wiki = class Wiki { } initialize_editorjs(blocks) { - this.dirty = false; const data = { blocks: blocks || [] }; @@ -456,9 +445,6 @@ frappe.views.Wiki = class Wiki { autofocus: false, data, tunes: ['spacingTune'], - onChange: () => { - this.dirty = true; - }, readOnly: true, logLevel: 'ERROR' }); @@ -516,6 +502,6 @@ frappe.views.Wiki = class Wiki { reload() { this.setup_wiki_pages(); - this.dirty = false; + this.undo.readOnly = true; } }; diff --git a/frappe/public/scss/desk/wiki.scss b/frappe/public/scss/desk/wiki.scss index cb911611d8..e9dcb63c4e 100644 --- a/frappe/public/scss/desk/wiki.scss +++ b/frappe/public/scss/desk/wiki.scss @@ -14,8 +14,11 @@ .standard-sidebar-item { justify-content: space-between; + padding: 0px; .sidebar-item-control { + margin-right: 8px; + > * { align-self: center; margin-left: 3px; @@ -32,6 +35,11 @@ display: none; } + .drop-icon { + padding: 10px 12px 10px 0px; + margin-right: -8px; + } + svg { margin-right: 0; } @@ -44,15 +52,18 @@ .item-anchor { display: flex; overflow: hidden; + padding: 8px 0px 8px 12px; flex: 1; } } - .sidebar-child-item-container { - margin-left: 10px; + .sidebar-item-container { + .sidebar-item-container{ + margin-left: 10px; - .standard-sidebar-item { - justify-content: start; + .standard-sidebar-item { + justify-content: start; + } } } diff --git a/package.json b/package.json index 17f5a7b588..7a54c81149 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "@editorjs/list": "^1.6.2", "babel-runtime": "^6.26.0", "chalk": "^2.3.2", - "editorjs-undo": "^0.1.5", + "editorjs-undo": "^0.1.6", "graphlib": "^2.1.8", "less": "^3.11.1", "rollup": "^1.2.2", diff --git a/yarn.lock b/yarn.lock index 8d0b04c622..0c3909dfb5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2265,10 +2265,10 @@ "jsbn" "~0.1.0" "safer-buffer" "^2.1.0" -"editorjs-undo@^0.1.5": - "integrity" "sha512-+qRmTe7Asn9KrsYHMCtNQi6rCBa+qrinJx/p7/Hj8K62HFzhMEuy7aMRbADd/KqcV2AsPVzgCj3PMHPmb6ZAkA==" - "resolved" "https://registry.npmjs.org/editorjs-undo/-/editorjs-undo-0.1.5.tgz" - "version" "0.1.5" +"editorjs-undo@^0.1.6": + "integrity" "sha512-zVHPnBf2mcI8hWT9Eu8H3bGDEcMj4gppXbQjJW11Aa8Kdy2SVBGhM6fS59OUlBsm8iHWLxuoG2NUIfy9Rd30sw==" + "resolved" "https://registry.npmjs.org/editorjs-undo/-/editorjs-undo-0.1.6.tgz" + "version" "0.1.6" "ee-first@1.1.1": "integrity" "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" From cb5543665fc7b1e1a658e60601f1b4178d84bfda Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 26 May 2021 18:27:26 +0530 Subject: [PATCH 023/306] fix: minor fixes --- .../internal_wiki_page/internal_wiki_page.py | 6 +- frappe/public/js/frappe/views/wiki.js | 95 +++++++++++++------ 2 files changed, 66 insertions(+), 35 deletions(-) diff --git a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py index a53473e1fe..6be92f835d 100644 --- a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py +++ b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py @@ -11,10 +11,8 @@ from frappe.model.document import Document class InternalWikiPage(Document): def before_insert(self): - if frappe.db.count('Internal Wiki Page') == 0: - self.sequence_id = 1 - else: - self.sequence_id = frappe.get_last_doc('Internal Wiki Page').sequence_id + 1 + sequence_id_list = frappe.get_all('Internal Wiki Page', {'sequence_id'}) + self.sequence_id = max([page.sequence_id for page in sequence_id_list]) + 1 @frappe.whitelist() def save_wiki_page(title, parent, sb_items, deleted_pages, new_widgets, blocks, save=True): diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index b0ec3c1882..955476861b 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -10,12 +10,10 @@ frappe.views.Wiki = class Wiki { this.sidebar_items = {}; this.sorted_sidebar_items = []; this.deleted_sidebar_items = []; - this.tools = {}; this.isReadOnly = true; this.new_page = null; this.prepare_container(); this.setup_wiki_pages(); - this.tools = { header: { class: frappe.wiki_block.blocks['header'], @@ -63,16 +61,16 @@ frappe.views.Wiki = class Wiki { if (this.all_pages) { frappe.wiki_pages = {}; let root_pages = this.all_pages.filter(page => page.parent_page == '' || page.parent_page == null); - for (let page of this.all_pages || []) { + for (let page of this.all_pages) { frappe.wiki_pages[frappe.router.slug(page.name)] = page; } + if (this.new_page) { + frappe.set_route(`wiki/${frappe.router.slug(this.new_page)}`); + this.new_page = null; + } this.make_sidebar(root_pages); + frappe.router.route(); } - if (this.new_page) { - frappe.set_route(`wiki/${frappe.router.slug(this.new_page)}`); - this.new_page = null; - } - frappe.router.route(); }); } @@ -96,30 +94,13 @@ frappe.views.Wiki = class Wiki { } append_item(item, container) { - let is_current_page = frappe.router.slug(item.name) == frappe.router.slug(this.get_page_to_show()) || item.name == this.new_page; + let is_current_page = frappe.router.slug(item.name) == frappe.router.slug(this.get_page_to_show()); if (is_current_page) { item.selected = true; this.current_page_name = item.name; } - const item_container = function (item) { - return $(` -
-
- - ${frappe.utils.icon(item.icon || "folder-normal", "md")} - ${item.label || item.name} - -
-
-
- `); - }; - - let $item_container = item_container(item); + let $item_container = this.sidebar_item_container(item); let sidebar_control = $item_container.find('.sidebar-item-control'); this.add_sidebar_actions(item, sidebar_control); @@ -151,6 +132,23 @@ frappe.views.Wiki = class Wiki { } } + sidebar_item_container(item) { + return $(` +
+
+ + ${frappe.utils.icon(item.icon || "folder-normal", "md")} + ${item.label || item.name} + +
+
+
+ `); + } + show() { if (!this.all_pages) { // pages not yet loaded, call again after a bit @@ -256,9 +254,7 @@ frappe.views.Wiki = class Wiki { this.editor.readOnly.toggle(); this.editor.isReady .then(() => { - this.undo = new Undo({ editor: this.editor }); - this.undo.initialize({blocks: JSON.parse(this.content)}); - this.undo.readOnly = false; + this.initialize_editorjs_undo(); this.setup_customization_buttons(); this.show_sidebar_actions(); this.make_sidebar_sortable(); @@ -272,6 +268,12 @@ frappe.views.Wiki = class Wiki { }); } + initialize_editorjs_undo() { + this.undo = new Undo({ editor: this.editor }); + this.undo.initialize({blocks: JSON.parse(this.content)}); + this.undo.readOnly = false; + } + show_sidebar_actions() { this.sidebar.find('.standard-sidebar-section').addClass('show-control'); } @@ -326,7 +328,7 @@ frappe.views.Wiki = class Wiki { animation: 150, fallbackOnBody: true, swapThreshold: 0.65, - onEnd: function (evt) { + onEnd: function () { me.sorted_sidebar_items = []; for (let page of $('.standard-sidebar-section').find('.sidebar-item-container')) { let parent_page = ""; @@ -410,6 +412,7 @@ frappe.views.Wiki = class Wiki { primary_action_label: __('Create'), primary_action: (values) => { d.hide(); + this.initialize_editorjs_undo(); this.setup_customization_buttons(); this.title = values.title; this.parent = values.parent; @@ -428,6 +431,8 @@ frappe.views.Wiki = class Wiki { this.isReadOnly = false; this.editor.readOnly.toggle(); } + this.add_page_to_sidebar(values); + this.show_sidebar_actions(); this.make_sidebar_sortable(); this.make_blocks_sortable(); }); @@ -436,6 +441,32 @@ frappe.views.Wiki = class Wiki { d.show(); } + add_page_to_sidebar({title, parent}) { + let $sidebar = $('.standard-sidebar-section'); + let item = { + name: title, + parent_page: parent, + }; + let $sidebar_item = this.sidebar_item_container(item); + + this.add_custom_button( + frappe.utils.icon('drag', 'xs'), + null, + "drag-handle", + `${__('Drag')}`, + null, + $sidebar_item.find('.sidebar-item-control') + ); + + if (!parent) { + $sidebar_item.appendTo($sidebar); + } else { + let $child_section = $sidebar.find(`[item-name="${parent}"] .sidebar-child-item`); + $sidebar_item.appendTo($child_section); + $child_section.removeClass('hidden'); + } + } + initialize_editorjs(blocks) { const data = { blocks: blocks || [] @@ -456,6 +487,8 @@ frappe.views.Wiki = class Wiki { if (!this.title && this.current_page_name) { this.title = this.current_page_name; save = ''; + } else { + this.current_page_name = this.title; } let me = this; this.editor.save().then((outputData) => { From d7af6173e742be615187728bc248fd8b243d41d7 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 27 May 2021 12:08:55 +0530 Subject: [PATCH 024/306] fix: new child page not visible fix --- frappe/public/js/desk.bundle.js | 3 + frappe/public/js/frappe/views/wiki.js | 31 +- yarn.lock | 1757 +++++++++---------------- 3 files changed, 660 insertions(+), 1131 deletions(-) diff --git a/frappe/public/js/desk.bundle.js b/frappe/public/js/desk.bundle.js index 66eb72cda0..0f75ae2d6a 100644 --- a/frappe/public/js/desk.bundle.js +++ b/frappe/public/js/desk.bundle.js @@ -67,6 +67,7 @@ import "./frappe/views/container.js"; import "./frappe/views/breadcrumbs.js"; import "./frappe/views/factory.js"; import "./frappe/views/pageview.js"; +import "./frappe/views/wiki.js"; import "./frappe/ui/toolbar/awesome_bar.js"; // import "./frappe/ui/toolbar/energy_points_notifications.js"; @@ -85,6 +86,8 @@ import "./frappe/views/workspace/workspace.js"; import "./frappe/widgets/widget_group.js"; +import "./frappe/wiki_blocks/blocks.js"; + import "./frappe/ui/sort_selector.html"; import "./frappe/ui/sort_selector.js"; diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index 955476861b..a0635f5494 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -118,16 +118,20 @@ frappe.views.Wiki = class Wiki { $item_container.parent().toggleClass('hidden'); } - let $drop_icon = $(``); - $drop_icon.appendTo(sidebar_control); - let drop_icon = $item_container.find('.drop-icon').get(0); - let child_item_section = $item_container.find('.sidebar-child-item').get(0); + this.add_drop_icon(item, sidebar_control, $item_container); + } + + add_drop_icon(item, sidebar_control, $item_container) { + let $child_item_section = $item_container.find('.sidebar-child-item'); + let $drop_icon = $(``) + .appendTo(sidebar_control); + if (this.all_pages.some(e => e.parent_page == item.name)) { - drop_icon.classList.remove('hidden'); - drop_icon.addEventListener('click', () => { - child_item_section.classList.toggle("hidden"); - let icon = $(drop_icon).find("use").attr("href")==="#icon-small-down" ? "#icon-small-up" : "#icon-small-down"; - $(drop_icon).find("use").attr("href", icon); + $drop_icon.removeClass('hidden'); + $drop_icon.on('click', () => { + let icon = $drop_icon.find("use").attr("href")==="#icon-small-down" ? "#icon-small-up" : "#icon-small-down"; + $drop_icon.find("use").attr("href", icon); + $child_item_section.toggleClass("hidden"); }); } } @@ -461,7 +465,14 @@ frappe.views.Wiki = class Wiki { if (!parent) { $sidebar_item.appendTo($sidebar); } else { - let $child_section = $sidebar.find(`[item-name="${parent}"] .sidebar-child-item`); + let $item_container = $sidebar.find(`[item-name="${parent}"]`); + let $child_section = $item_container.find('.sidebar-child-item'); + let $drop_icon = $item_container.find('.drop-icon'); + if (!$child_section[0]) { + $child_section = $(``) + .appendTo($item_container); + $drop_icon.toggleClass('hidden'); + } $sidebar_item.appendTo($child_section); $child_section.removeClass('hidden'); } diff --git a/yarn.lock b/yarn.lock index d902fedd10..04e2d35012 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,156 +2,120 @@ # yarn lockfile v1 -"@babel/code-frame@^7.0.0": - "integrity" "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==" - "resolved" "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz" - "version" "7.0.0" - dependencies: - "@babel/highlight" "^7.0.0" - -"@babel/highlight@^7.0.0": - "integrity" "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==" - "resolved" "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz" - "version" "7.0.0" - dependencies: - "chalk" "^2.0.0" - "esutils" "^2.0.2" - "js-tokens" "^4.0.0" - -"@babel/runtime@^7.0.0-beta.46": - "integrity" "sha512-IvfvnMdSaLBateu0jfsYIpZTxAc2cKEXEMiezGGN75QcBcecDUKd3PgLAncT0oOgxKy8dd8hrJKj9MfzgfZd6g==" - "resolved" "https://registry.npmjs.org/@babel/runtime/-/runtime-7.3.4.tgz" - "version" "7.3.4" - dependencies: - "regenerator-runtime" "^0.12.0" - -"@dabh/diagnostics@^2.0.2": - "integrity" "sha512-+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q==" - "resolved" "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.2.tgz" - "version" "2.0.2" - dependencies: - "colorspace" "1.1.x" - "enabled" "2.0.x" - "kuler" "^2.0.0" +"@assemblyscript/loader@^0.10.1": + version "0.10.1" + resolved "https://registry.yarnpkg.com/@assemblyscript/loader/-/loader-0.10.1.tgz#70e45678f06c72fa2e350e8553ec4a4d72b92e06" + integrity sha512-H71nDOOL8Y7kWRLqf6Sums+01Q5msqBW2KhDUTemh1tvY04eSkSXrK0uj/4mmY0Xr16/3zyZmsrxN7CKuRbNRg== "@deepcode/dcignore@^1.0.2": - "integrity" "sha512-DPgxtHuJwBORpqRkPXzzOT+uoPRVJmaN7LR+pmeL6DQM90kj6G6GFUH1i/YpRH8NbML8ZGEDwB9f9u4UwD2pzg==" - "resolved" "https://registry.npmjs.org/@deepcode/dcignore/-/dcignore-1.0.2.tgz" - "version" "1.0.2" + version "1.0.2" + resolved "https://registry.npmjs.org/@deepcode/dcignore/-/dcignore-1.0.2.tgz" + integrity sha512-DPgxtHuJwBORpqRkPXzzOT+uoPRVJmaN7LR+pmeL6DQM90kj6G6GFUH1i/YpRH8NbML8ZGEDwB9f9u4UwD2pzg== "@editorjs/checklist@^1.3.0": - "integrity" "sha512-087oW0oOIE5HX8llj4Eap/reFDFw8VCLlp6GU0E9GEp7f3zy2aV6KdFR+6dbYhZ50w7tSnkMpCAcSq1NXJeB4Q==" - "resolved" "https://registry.npmjs.org/@editorjs/checklist/-/checklist-1.3.0.tgz" - "version" "1.3.0" + version "1.3.0" + resolved "https://registry.npmjs.org/@editorjs/checklist/-/checklist-1.3.0.tgz" + integrity sha512-087oW0oOIE5HX8llj4Eap/reFDFw8VCLlp6GU0E9GEp7f3zy2aV6KdFR+6dbYhZ50w7tSnkMpCAcSq1NXJeB4Q== "@editorjs/editorjs@^2.20.0": - "integrity" "sha512-e6DWi8bMypFhovq9R6cefaDWVfrlVU++Q7ABp79+MxZIuC/SKAW5EtxBbKPL22H/Mc3bJIhZCxOqEl70HBh2yw==" - "resolved" "https://registry.npmjs.org/@editorjs/editorjs/-/editorjs-2.20.0.tgz" - "version" "2.20.0" + version "2.20.0" + resolved "https://registry.npmjs.org/@editorjs/editorjs/-/editorjs-2.20.0.tgz" + integrity sha512-e6DWi8bMypFhovq9R6cefaDWVfrlVU++Q7ABp79+MxZIuC/SKAW5EtxBbKPL22H/Mc3bJIhZCxOqEl70HBh2yw== dependencies: - "codex-notifier" "^1.1.2" - "codex-tooltip" "^1.0.1" + codex-notifier "^1.1.2" + codex-tooltip "^1.0.1" "@editorjs/header@^2.6.1": - "integrity" "sha512-EsnyVFv5uThpU9tbQ/dUPFCQoa/sBFy2n+9tN3wOXJGx7sjea4fdcacJ2UYhO+7pCgZ+aSgmMOyGLYHUFbchvA==" - "resolved" "https://registry.npmjs.org/@editorjs/header/-/header-2.6.1.tgz" - "version" "2.6.1" + version "2.6.1" + resolved "https://registry.npmjs.org/@editorjs/header/-/header-2.6.1.tgz" + integrity sha512-EsnyVFv5uThpU9tbQ/dUPFCQoa/sBFy2n+9tN3wOXJGx7sjea4fdcacJ2UYhO+7pCgZ+aSgmMOyGLYHUFbchvA== "@editorjs/list@^1.6.2": - "integrity" "sha512-OxowV0yuE11G01czYM1dEQlz1F37ehX0ak5vAbZ9ncSXrPh0fDRw/fBxTY654FlmrsQ40UFom3owSG++tLvVGw==" - "resolved" "https://registry.npmjs.org/@editorjs/list/-/list-1.6.2.tgz" - "version" "1.6.2" + version "1.6.2" + resolved "https://registry.npmjs.org/@editorjs/list/-/list-1.6.2.tgz" + integrity sha512-OxowV0yuE11G01czYM1dEQlz1F37ehX0ak5vAbZ9ncSXrPh0fDRw/fBxTY654FlmrsQ40UFom3owSG++tLvVGw== "@nodelib/fs.scandir@2.1.4": - "integrity" "sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==" - "resolved" "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz" - "version" "2.1.4" + version "2.1.4" + resolved "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz" + integrity sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA== dependencies: "@nodelib/fs.stat" "2.0.4" - "run-parallel" "^1.1.9" + run-parallel "^1.1.9" -"@nodelib/fs.stat@^2.0.2", "@nodelib/fs.stat@2.0.4": - "integrity" "sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==" - "resolved" "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz" - "version" "2.0.4" +"@nodelib/fs.stat@2.0.4", "@nodelib/fs.stat@^2.0.2": + version "2.0.4" + resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz" + integrity sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q== "@nodelib/fs.walk@^1.2.3": - "integrity" "sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==" - "resolved" "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz" - "version" "1.2.6" + version "1.2.6" + resolved "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz" + integrity sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow== dependencies: "@nodelib/fs.scandir" "2.1.4" - "fastq" "^1.6.0" + fastq "^1.6.0" "@octetstream/promisify@2.0.2": - "integrity" "sha512-7XHoRB61hxsz8lBQrjC1tq/3OEIgpvGWg6DKAdwi7WRzruwkmsdwmOoUXbU4Dtd4RSOMDwed0SkP3y8UlMt1Bg==" - "resolved" "https://registry.npmjs.org/@octetstream/promisify/-/promisify-2.0.2.tgz" - "version" "2.0.2" + version "2.0.2" + resolved "https://registry.npmjs.org/@octetstream/promisify/-/promisify-2.0.2.tgz" + integrity sha512-7XHoRB61hxsz8lBQrjC1tq/3OEIgpvGWg6DKAdwi7WRzruwkmsdwmOoUXbU4Dtd4RSOMDwed0SkP3y8UlMt1Bg== "@open-policy-agent/opa-wasm@^1.2.0": - "integrity" "sha512-CtUBTnzvDrT0NASa8IuGQTxFGgt2vxbLnMYuTA+uDFxOcA4uK4mGFgrhHJtxUZnWHiwemOvKKSY3BMCo7qiAsQ==" - "resolved" "https://registry.npmjs.org/@open-policy-agent/opa-wasm/-/opa-wasm-1.2.0.tgz" - "version" "1.2.0" + version "1.2.0" + resolved "https://registry.npmjs.org/@open-policy-agent/opa-wasm/-/opa-wasm-1.2.0.tgz" + integrity sha512-CtUBTnzvDrT0NASa8IuGQTxFGgt2vxbLnMYuTA+uDFxOcA4uK4mGFgrhHJtxUZnWHiwemOvKKSY3BMCo7qiAsQ== dependencies: - "sprintf-js" "^1.1.2" - "utf8" "^3.0.0" + sprintf-js "^1.1.2" + utf8 "^3.0.0" "@sindresorhus/is@^0.14.0": - "integrity" "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==" - "resolved" "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz" - "version" "0.14.0" + version "0.14.0" + resolved "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz" + integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== "@sindresorhus/is@^2.1.1": - "integrity" "sha512-/aPsuoj/1Dw/kzhkgz+ES6TxG0zfTMGLwuK2ZG00k/iJzYHTLCE8mVU8EPqEOp/lmxPoq1C1C9RYToRKb2KEfg==" - "resolved" "https://registry.npmjs.org/@sindresorhus/is/-/is-2.1.1.tgz" - "version" "2.1.1" - -"@snyk/cli-interface@^2.0.3": - "integrity" "sha512-jmZyxVHqzYU1GfdnWCGdd68WY/lAzpPVyqalHazPj4tFJehrSfEFc82RMTYAMgXEJuvFRFIwhsvXh3sWUhIQmg==" - "resolved" "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.3.2.tgz" - "version" "2.3.2" - dependencies: - "tslib" "^1.9.3" + version "2.1.1" + resolved "https://registry.npmjs.org/@sindresorhus/is/-/is-2.1.1.tgz" + integrity sha512-/aPsuoj/1Dw/kzhkgz+ES6TxG0zfTMGLwuK2ZG00k/iJzYHTLCE8mVU8EPqEOp/lmxPoq1C1C9RYToRKb2KEfg== -"@snyk/cli-interface@^2.11.0", "@snyk/cli-interface@2.11.0": - "integrity" "sha512-T3xfDqrEFKclHGdJx4/5+D5F7e76/99f33guE4RTlVITBhy7VVnjz4t/NDr3UYqcC0MgAmiC4bSVYHnlshuwJw==" - "resolved" "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.11.0.tgz" - "version" "2.11.0" +"@snyk/cli-interface@2.11.0", "@snyk/cli-interface@^2.11.0": + version "2.11.0" + resolved "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.11.0.tgz" + integrity sha512-T3xfDqrEFKclHGdJx4/5+D5F7e76/99f33guE4RTlVITBhy7VVnjz4t/NDr3UYqcC0MgAmiC4bSVYHnlshuwJw== dependencies: "@types/graphlib" "^2" -"@snyk/cli-interface@^2.9.1": - "integrity" "sha512-C64bGtcQbh7941l7qgXFJ+FJIZdQtBHkPhKfGtUlCCMbC0FK0oaUmp6d7YPQxT4dEnkQdtlBT/eA2F6qIKbEng==" - "resolved" "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.9.2.tgz" - "version" "2.9.2" +"@snyk/cli-interface@^2.0.3": + version "2.3.2" + resolved "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.3.2.tgz" + integrity sha512-jmZyxVHqzYU1GfdnWCGdd68WY/lAzpPVyqalHazPj4tFJehrSfEFc82RMTYAMgXEJuvFRFIwhsvXh3sWUhIQmg== dependencies: - "@snyk/dep-graph" "1.19.4" - "@types/graphlib" "^2.1.7" - "tslib" "^1.9.3" + tslib "^1.9.3" -"@snyk/cli-interface@^2.9.2": - "integrity" "sha512-C64bGtcQbh7941l7qgXFJ+FJIZdQtBHkPhKfGtUlCCMbC0FK0oaUmp6d7YPQxT4dEnkQdtlBT/eA2F6qIKbEng==" - "resolved" "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.9.2.tgz" - "version" "2.9.2" +"@snyk/cli-interface@^2.9.1", "@snyk/cli-interface@^2.9.2": + version "2.9.2" + resolved "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.9.2.tgz" + integrity sha512-C64bGtcQbh7941l7qgXFJ+FJIZdQtBHkPhKfGtUlCCMbC0FK0oaUmp6d7YPQxT4dEnkQdtlBT/eA2F6qIKbEng== dependencies: "@snyk/dep-graph" "1.19.4" "@types/graphlib" "^2.1.7" - "tslib" "^1.9.3" + tslib "^1.9.3" "@snyk/cocoapods-lockfile-parser@3.6.2": - "integrity" "sha512-ca2JKOnSRzYHJkhOB9gYmdRZHmd02b/uBd/S0D5W+L9nIMS7sUBV5jfhKwVgrYPIpVNIc0XCI9rxK4TfkQRpiA==" - "resolved" "https://registry.npmjs.org/@snyk/cocoapods-lockfile-parser/-/cocoapods-lockfile-parser-3.6.2.tgz" - "version" "3.6.2" + version "3.6.2" + resolved "https://registry.npmjs.org/@snyk/cocoapods-lockfile-parser/-/cocoapods-lockfile-parser-3.6.2.tgz" + integrity sha512-ca2JKOnSRzYHJkhOB9gYmdRZHmd02b/uBd/S0D5W+L9nIMS7sUBV5jfhKwVgrYPIpVNIc0XCI9rxK4TfkQRpiA== dependencies: "@snyk/dep-graph" "^1.23.1" "@types/js-yaml" "^3.12.1" - "js-yaml" "^3.13.1" - "tslib" "^1.10.0" + js-yaml "^3.13.1" + tslib "^1.10.0" "@snyk/code-client@3.4.0": - "integrity" "sha512-RY2IftAiWB7tp36Mcq7WiEwqoD8A/mqrD6N7oDWTxBOIqsH0t4djo/UibiWDJotaffO9aXXndOf3iZ/kTt+Rdg==" - "resolved" "https://registry.npmjs.org/@snyk/code-client/-/code-client-3.4.0.tgz" - "version" "3.4.0" + version "3.4.0" + resolved "https://registry.npmjs.org/@snyk/code-client/-/code-client-3.4.0.tgz" + integrity sha512-RY2IftAiWB7tp36Mcq7WiEwqoD8A/mqrD6N7oDWTxBOIqsH0t4djo/UibiWDJotaffO9aXXndOf3iZ/kTt+Rdg== dependencies: "@deepcode/dcignore" "^1.0.2" "@snyk/fast-glob" "^3.2.6-patch" @@ -162,275 +126,263 @@ "@types/micromatch" "^4.0.1" "@types/sarif" "^2.1.3" "@types/uuid" "^8.3.0" - "axios" "^0.21.1" - "ignore" "^5.1.8" - "lodash.chunk" "^4.2.0" - "lodash.omit" "^4.5.0" - "lodash.union" "^4.6.0" - "micromatch" "^4.0.2" - "queue" "^6.0.1" - "uuid" "^8.3.2" + axios "^0.21.1" + ignore "^5.1.8" + lodash.chunk "^4.2.0" + lodash.omit "^4.5.0" + lodash.union "^4.6.0" + micromatch "^4.0.2" + queue "^6.0.1" + uuid "^8.3.2" "@snyk/composer-lockfile-parser@^1.4.1": - "integrity" "sha512-wNANv235j95NFsQuODIXCiQZ9kcyg9fz92Kg1zoGvaP3kN/ma7fgCnvQL/dyml6iouQJR5aZovjhrrfEFoKtiQ==" - "resolved" "https://registry.npmjs.org/@snyk/composer-lockfile-parser/-/composer-lockfile-parser-1.4.1.tgz" - "version" "1.4.1" - dependencies: - "lodash.findkey" "^4.6.0" - "lodash.get" "^4.4.2" - "lodash.invert" "^4.3.0" - "lodash.isempty" "^4.4.0" - -"@snyk/dep-graph@^1.19.3": - "integrity" "sha512-h3MMhjVm3BuIruwpDBqnMowKOG9viwr3TJHdIxTHulWKWSsPTTW1AAP3/RaK+UBp1y/Ua9yzeHncKIrzBdT5Nw==" - "resolved" "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.19.4.tgz" - "version" "1.19.4" - dependencies: - "graphlib" "^2.1.8" - "lodash.isequal" "^4.5.0" - "object-hash" "^2.0.3" - "semver" "^6.0.0" - "source-map-support" "^0.5.19" - "tslib" "^1.13.0" - -"@snyk/dep-graph@^1", "@snyk/dep-graph@^1.21.0", "@snyk/dep-graph@^1.23.0", "@snyk/dep-graph@^1.23.1", "@snyk/dep-graph@^1.27.1", "@snyk/dep-graph@^1.28.0": - "integrity" "sha512-Oup9nAvb558jdNvbZah/vaBtOtCcizkdeS+OBQeBIqIffyer4mc4juSn4b1SFjCpu7AG7piio8Lj8k1B9ps6Tg==" - "resolved" "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.28.0.tgz" - "version" "1.28.0" - dependencies: - "event-loop-spinner" "^2.1.0" - "lodash.clone" "^4.5.0" - "lodash.constant" "^3.0.0" - "lodash.filter" "^4.6.0" - "lodash.foreach" "^4.5.0" - "lodash.isempty" "^4.4.0" - "lodash.isequal" "^4.5.0" - "lodash.isfunction" "^3.0.9" - "lodash.isundefined" "^3.0.1" - "lodash.keys" "^4.2.0" - "lodash.map" "^4.6.0" - "lodash.reduce" "^4.6.0" - "lodash.size" "^4.2.0" - "lodash.transform" "^4.6.0" - "lodash.union" "^4.6.0" - "lodash.values" "^4.3.0" - "object-hash" "^2.0.3" - "semver" "^7.0.0" - "tslib" "^1.13.0" - -"@snyk/dep-graph@1.19.4": - "integrity" "sha512-h3MMhjVm3BuIruwpDBqnMowKOG9viwr3TJHdIxTHulWKWSsPTTW1AAP3/RaK+UBp1y/Ua9yzeHncKIrzBdT5Nw==" - "resolved" "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.19.4.tgz" - "version" "1.19.4" - dependencies: - "graphlib" "^2.1.8" - "lodash.isequal" "^4.5.0" - "object-hash" "^2.0.3" - "semver" "^6.0.0" - "source-map-support" "^0.5.19" - "tslib" "^1.13.0" + version "1.4.1" + resolved "https://registry.npmjs.org/@snyk/composer-lockfile-parser/-/composer-lockfile-parser-1.4.1.tgz" + integrity sha512-wNANv235j95NFsQuODIXCiQZ9kcyg9fz92Kg1zoGvaP3kN/ma7fgCnvQL/dyml6iouQJR5aZovjhrrfEFoKtiQ== + dependencies: + lodash.findkey "^4.6.0" + lodash.get "^4.4.2" + lodash.invert "^4.3.0" + lodash.isempty "^4.4.0" + +"@snyk/dep-graph@1.19.4", "@snyk/dep-graph@^1.19.3": + version "1.19.4" + resolved "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.19.4.tgz" + integrity sha512-h3MMhjVm3BuIruwpDBqnMowKOG9viwr3TJHdIxTHulWKWSsPTTW1AAP3/RaK+UBp1y/Ua9yzeHncKIrzBdT5Nw== + dependencies: + graphlib "^2.1.8" + lodash.isequal "^4.5.0" + object-hash "^2.0.3" + semver "^6.0.0" + source-map-support "^0.5.19" + tslib "^1.13.0" + +"@snyk/dep-graph@^1.21.0", "@snyk/dep-graph@^1.23.0", "@snyk/dep-graph@^1.23.1", "@snyk/dep-graph@^1.27.1", "@snyk/dep-graph@^1.28.0": + version "1.28.0" + resolved "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.28.0.tgz" + integrity sha512-Oup9nAvb558jdNvbZah/vaBtOtCcizkdeS+OBQeBIqIffyer4mc4juSn4b1SFjCpu7AG7piio8Lj8k1B9ps6Tg== + dependencies: + event-loop-spinner "^2.1.0" + lodash.clone "^4.5.0" + lodash.constant "^3.0.0" + lodash.filter "^4.6.0" + lodash.foreach "^4.5.0" + lodash.isempty "^4.4.0" + lodash.isequal "^4.5.0" + lodash.isfunction "^3.0.9" + lodash.isundefined "^3.0.1" + lodash.keys "^4.2.0" + lodash.map "^4.6.0" + lodash.reduce "^4.6.0" + lodash.size "^4.2.0" + lodash.transform "^4.6.0" + lodash.union "^4.6.0" + lodash.values "^4.3.0" + object-hash "^2.0.3" + semver "^7.0.0" + tslib "^1.13.0" "@snyk/docker-registry-v2-client@1.13.9": - "integrity" "sha512-DIFLEhr8m1GrAwsLGInJmpcQMacjuhf3jcbpQTR+LeMvZA9IuKq+B7kqw2O2FzMiHMZmUb5z+tV+BR7+IUHkFQ==" - "resolved" "https://registry.npmjs.org/@snyk/docker-registry-v2-client/-/docker-registry-v2-client-1.13.9.tgz" - "version" "1.13.9" + version "1.13.9" + resolved "https://registry.npmjs.org/@snyk/docker-registry-v2-client/-/docker-registry-v2-client-1.13.9.tgz" + integrity sha512-DIFLEhr8m1GrAwsLGInJmpcQMacjuhf3jcbpQTR+LeMvZA9IuKq+B7kqw2O2FzMiHMZmUb5z+tV+BR7+IUHkFQ== dependencies: - "needle" "^2.5.0" - "parse-link-header" "^1.0.1" - "tslib" "^1.10.0" + needle "^2.5.0" + parse-link-header "^1.0.1" + tslib "^1.10.0" "@snyk/fast-glob@^3.2.6-patch": - "integrity" "sha512-E/Pfdze/WFfxwyuTFcfhQN1SwyUsc43yuCoW63RVBCaxTD6OzhVD2Pvc/Sy7BjiWUfmelzyKkIBpoow8zZX7Zg==" - "resolved" "https://registry.npmjs.org/@snyk/fast-glob/-/fast-glob-3.2.6-patch.tgz" - "version" "3.2.6-patch" + version "3.2.6-patch" + resolved "https://registry.npmjs.org/@snyk/fast-glob/-/fast-glob-3.2.6-patch.tgz" + integrity sha512-E/Pfdze/WFfxwyuTFcfhQN1SwyUsc43yuCoW63RVBCaxTD6OzhVD2Pvc/Sy7BjiWUfmelzyKkIBpoow8zZX7Zg== dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" "@snyk/glob-parent" "^5.1.2-patch.1" - "merge2" "^1.3.0" - "micromatch" "^4.0.2" - "picomatch" "^2.2.1" + merge2 "^1.3.0" + micromatch "^4.0.2" + picomatch "^2.2.1" "@snyk/fix@1.518.0": - "integrity" "sha512-Cwh0wU8SxZgx1+qRgcGkMctNx9F6UCdUJYcCvKaYJNDEYQwpQat4nsLZsJeODYNx7Byh0ZnPrqakUck4qFrPvA==" - "resolved" "https://registry.npmjs.org/@snyk/fix/-/fix-1.518.0.tgz" - "version" "1.518.0" + version "1.518.0" + resolved "https://registry.npmjs.org/@snyk/fix/-/fix-1.518.0.tgz" + integrity sha512-Cwh0wU8SxZgx1+qRgcGkMctNx9F6UCdUJYcCvKaYJNDEYQwpQat4nsLZsJeODYNx7Byh0ZnPrqakUck4qFrPvA== dependencies: "@snyk/dep-graph" "^1.21.0" - "chalk" "4.1.0" - "debug" "^4.3.1" - "micromatch" "4.0.2" - "ora" "5.3.0" - "p-map" "^4.0.0" - "strip-ansi" "6.0.0" + chalk "4.1.0" + debug "^4.3.1" + micromatch "4.0.2" + ora "5.3.0" + p-map "^4.0.0" + strip-ansi "6.0.0" "@snyk/gemfile@1.2.0": - "integrity" "sha512-nI7ELxukf7pT4/VraL4iabtNNMz8mUo7EXlqCFld8O5z6mIMLX9llps24iPpaIZOwArkY3FWA+4t+ixyvtTSIA==" - "resolved" "https://registry.npmjs.org/@snyk/gemfile/-/gemfile-1.2.0.tgz" - "version" "1.2.0" + version "1.2.0" + resolved "https://registry.npmjs.org/@snyk/gemfile/-/gemfile-1.2.0.tgz" + integrity sha512-nI7ELxukf7pT4/VraL4iabtNNMz8mUo7EXlqCFld8O5z6mIMLX9llps24iPpaIZOwArkY3FWA+4t+ixyvtTSIA== "@snyk/glob-parent@^5.1.2-patch.1": - "integrity" "sha512-OkUPdHgxIWKAAzceG1nraNA0kgI+eS0I9wph8tll9UL0slD2mIWSj4mAqroGovaEXm8nHedoUfuDRGEb6wnzCQ==" - "resolved" "https://registry.npmjs.org/@snyk/glob-parent/-/glob-parent-5.1.2-patch.1.tgz" - "version" "5.1.2-patch.1" - dependencies: - "is-glob" "^4.0.1" - -"@snyk/graphlib@^2.1.9-patch.3", "@snyk/graphlib@2.1.9-patch.3": - "integrity" "sha512-bBY9b9ulfLj0v2Eer0yFYa3syVeIxVKl2EpxSrsVeT4mjA0CltZyHsF0JjoaGXP27nItTdJS5uVsj1NA+3aE+Q==" - "resolved" "https://registry.npmjs.org/@snyk/graphlib/-/graphlib-2.1.9-patch.3.tgz" - "version" "2.1.9-patch.3" - dependencies: - "lodash.clone" "^4.5.0" - "lodash.constant" "^3.0.0" - "lodash.filter" "^4.6.0" - "lodash.foreach" "^4.5.0" - "lodash.has" "^4.5.2" - "lodash.isempty" "^4.4.0" - "lodash.isfunction" "^3.0.9" - "lodash.isundefined" "^3.0.1" - "lodash.keys" "^4.2.0" - "lodash.map" "^4.6.0" - "lodash.reduce" "^4.6.0" - "lodash.size" "^4.2.0" - "lodash.transform" "^4.6.0" - "lodash.union" "^4.6.0" - "lodash.values" "^4.3.0" + version "5.1.2-patch.1" + resolved "https://registry.npmjs.org/@snyk/glob-parent/-/glob-parent-5.1.2-patch.1.tgz" + integrity sha512-OkUPdHgxIWKAAzceG1nraNA0kgI+eS0I9wph8tll9UL0slD2mIWSj4mAqroGovaEXm8nHedoUfuDRGEb6wnzCQ== + dependencies: + is-glob "^4.0.1" + +"@snyk/graphlib@2.1.9-patch.3", "@snyk/graphlib@^2.1.9-patch.3": + version "2.1.9-patch.3" + resolved "https://registry.npmjs.org/@snyk/graphlib/-/graphlib-2.1.9-patch.3.tgz" + integrity sha512-bBY9b9ulfLj0v2Eer0yFYa3syVeIxVKl2EpxSrsVeT4mjA0CltZyHsF0JjoaGXP27nItTdJS5uVsj1NA+3aE+Q== + dependencies: + lodash.clone "^4.5.0" + lodash.constant "^3.0.0" + lodash.filter "^4.6.0" + lodash.foreach "^4.5.0" + lodash.has "^4.5.2" + lodash.isempty "^4.4.0" + lodash.isfunction "^3.0.9" + lodash.isundefined "^3.0.1" + lodash.keys "^4.2.0" + lodash.map "^4.6.0" + lodash.reduce "^4.6.0" + lodash.size "^4.2.0" + lodash.transform "^4.6.0" + lodash.union "^4.6.0" + lodash.values "^4.3.0" "@snyk/inquirer@^7.3.3-patch": - "integrity" "sha512-aWiQSOacH2lOpJ1ard9ErABcH4tdJogdr+mg1U67iZJOPO9n2gFgAwz1TQJDyPkv4/A5mh4hT2rg03Uq+KBn2Q==" - "resolved" "https://registry.npmjs.org/@snyk/inquirer/-/inquirer-7.3.3-patch.tgz" - "version" "7.3.3-patch" - dependencies: - "ansi-escapes" "^4.2.1" - "chalk" "^4.1.0" - "cli-cursor" "^3.1.0" - "cli-width" "^3.0.0" - "external-editor" "^3.0.3" - "figures" "^3.0.0" - "lodash.assign" "^4.2.0" - "lodash.assignin" "^4.2.0" - "lodash.clone" "^4.5.0" - "lodash.defaults" "^4.2.0" - "lodash.filter" "^4.6.0" - "lodash.find" "^4.6.0" - "lodash.findindex" "^4.6.0" - "lodash.flatten" "^4.4.0" - "lodash.isboolean" "^3.0.3" - "lodash.isfunction" "^3.0.9" - "lodash.isnumber" "^3.0.3" - "lodash.isplainobject" "^4.0.6" - "lodash.isstring" "^4.0.1" - "lodash.last" "^3.0.0" - "lodash.map" "^4.6.0" - "lodash.omit" "^4.5.0" - "lodash.set" "^4.3.2" - "lodash.sum" "^4.0.2" - "lodash.uniq" "^4.5.0" - "mute-stream" "0.0.8" - "run-async" "^2.4.0" - "rxjs" "^6.6.0" - "string-width" "^4.1.0" - "strip-ansi" "^6.0.0" - "through" "^2.3.6" + version "7.3.3-patch" + resolved "https://registry.npmjs.org/@snyk/inquirer/-/inquirer-7.3.3-patch.tgz" + integrity sha512-aWiQSOacH2lOpJ1ard9ErABcH4tdJogdr+mg1U67iZJOPO9n2gFgAwz1TQJDyPkv4/A5mh4hT2rg03Uq+KBn2Q== + dependencies: + ansi-escapes "^4.2.1" + chalk "^4.1.0" + cli-cursor "^3.1.0" + cli-width "^3.0.0" + external-editor "^3.0.3" + figures "^3.0.0" + lodash.assign "^4.2.0" + lodash.assignin "^4.2.0" + lodash.clone "^4.5.0" + lodash.defaults "^4.2.0" + lodash.filter "^4.6.0" + lodash.find "^4.6.0" + lodash.findindex "^4.6.0" + lodash.flatten "^4.4.0" + lodash.isboolean "^3.0.3" + lodash.isfunction "^3.0.9" + lodash.isnumber "^3.0.3" + lodash.isplainobject "^4.0.6" + lodash.isstring "^4.0.1" + lodash.last "^3.0.0" + lodash.map "^4.6.0" + lodash.omit "^4.5.0" + lodash.set "^4.3.2" + lodash.sum "^4.0.2" + lodash.uniq "^4.5.0" + mute-stream "0.0.8" + run-async "^2.4.0" + rxjs "^6.6.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + through "^2.3.6" "@snyk/java-call-graph-builder@1.19.1": - "integrity" "sha512-bxjHef5Qm3pNc+BrFlxMudmSSbOjA395ZqBddc+dvsFHoHeyNbiY56Y1JSGUlTgjRM+PKNPBiCuELTSMaROeZg==" - "resolved" "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.19.1.tgz" - "version" "1.19.1" + version "1.19.1" + resolved "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.19.1.tgz" + integrity sha512-bxjHef5Qm3pNc+BrFlxMudmSSbOjA395ZqBddc+dvsFHoHeyNbiY56Y1JSGUlTgjRM+PKNPBiCuELTSMaROeZg== dependencies: "@snyk/graphlib" "2.1.9-patch.3" - "ci-info" "^2.0.0" - "debug" "^4.1.1" - "glob" "^7.1.6" - "jszip" "^3.2.2" - "needle" "^2.3.3" - "progress" "^2.0.3" - "snyk-config" "^4.0.0-rc.2" - "source-map-support" "^0.5.7" - "temp-dir" "^2.0.0" - "tmp" "^0.2.1" - "tslib" "^1.9.3" - "xml-js" "^1.6.11" + ci-info "^2.0.0" + debug "^4.1.1" + glob "^7.1.6" + jszip "^3.2.2" + needle "^2.3.3" + progress "^2.0.3" + snyk-config "^4.0.0-rc.2" + source-map-support "^0.5.7" + temp-dir "^2.0.0" + tmp "^0.2.1" + tslib "^1.9.3" + xml-js "^1.6.11" "@snyk/java-call-graph-builder@1.20.0": - "integrity" "sha512-NX8bpIu7oG5cuSSm6WvtxqcCuJs2gRjtKhtuSeF1p5TYXyESs3FXQ0nHjfY90LiyTTc+PW/UBq6SKbBA6bCBww==" - "resolved" "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.20.0.tgz" - "version" "1.20.0" + version "1.20.0" + resolved "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.20.0.tgz" + integrity sha512-NX8bpIu7oG5cuSSm6WvtxqcCuJs2gRjtKhtuSeF1p5TYXyESs3FXQ0nHjfY90LiyTTc+PW/UBq6SKbBA6bCBww== dependencies: "@snyk/graphlib" "2.1.9-patch.3" - "ci-info" "^2.0.0" - "debug" "^4.1.1" - "glob" "^7.1.6" - "jszip" "^3.2.2" - "needle" "^2.3.3" - "progress" "^2.0.3" - "snyk-config" "^4.0.0-rc.2" - "source-map-support" "^0.5.7" - "temp-dir" "^2.0.0" - "tmp" "^0.2.1" - "tslib" "^1.9.3" - "xml-js" "^1.6.11" + ci-info "^2.0.0" + debug "^4.1.1" + glob "^7.1.6" + jszip "^3.2.2" + needle "^2.3.3" + progress "^2.0.3" + snyk-config "^4.0.0-rc.2" + source-map-support "^0.5.7" + temp-dir "^2.0.0" + tmp "^0.2.1" + tslib "^1.9.3" + xml-js "^1.6.11" "@snyk/mix-parser@^1.1.0": - "integrity" "sha512-KmX4Le+1M01m6kM2UeDColzMZctrSqoMGajqcRHR3dLpCyHE3nzZzPeOWjbUVgjQlTX07oQvq9udSJGZJ/+Gdg==" - "resolved" "https://registry.npmjs.org/@snyk/mix-parser/-/mix-parser-1.1.1.tgz" - "version" "1.1.1" + version "1.1.1" + resolved "https://registry.npmjs.org/@snyk/mix-parser/-/mix-parser-1.1.1.tgz" + integrity sha512-KmX4Le+1M01m6kM2UeDColzMZctrSqoMGajqcRHR3dLpCyHE3nzZzPeOWjbUVgjQlTX07oQvq9udSJGZJ/+Gdg== dependencies: "@snyk/dep-graph" "^1.28.0" - "tslib" "^2.0.0" + tslib "^2.0.0" "@snyk/rpm-parser@^2.0.0": - "integrity" "sha512-bWjQY5Xk3TcfVpeo8M5BhhSUEdPr2P19AWW13CHPu6sFZkckLWEcjQycnBsVD6RBmxGXecJ1YNui8dq6soHoYQ==" - "resolved" "https://registry.npmjs.org/@snyk/rpm-parser/-/rpm-parser-2.0.0.tgz" - "version" "2.0.0" + version "2.0.0" + resolved "https://registry.npmjs.org/@snyk/rpm-parser/-/rpm-parser-2.0.0.tgz" + integrity sha512-bWjQY5Xk3TcfVpeo8M5BhhSUEdPr2P19AWW13CHPu6sFZkckLWEcjQycnBsVD6RBmxGXecJ1YNui8dq6soHoYQ== dependencies: - "event-loop-spinner" "^2.0.0" + event-loop-spinner "^2.0.0" "@snyk/snyk-cocoapods-plugin@2.5.2": - "integrity" "sha512-WHhnwyoGOhjFOjBXqUfszD84SErrtjHjium/4xFbqKpEE+yuwxs8OwV/S29BtxhYiGtjpD1azv5QtH30VUMl0A==" - "resolved" "https://registry.npmjs.org/@snyk/snyk-cocoapods-plugin/-/snyk-cocoapods-plugin-2.5.2.tgz" - "version" "2.5.2" + version "2.5.2" + resolved "https://registry.npmjs.org/@snyk/snyk-cocoapods-plugin/-/snyk-cocoapods-plugin-2.5.2.tgz" + integrity sha512-WHhnwyoGOhjFOjBXqUfszD84SErrtjHjium/4xFbqKpEE+yuwxs8OwV/S29BtxhYiGtjpD1azv5QtH30VUMl0A== dependencies: "@snyk/cli-interface" "^2.11.0" "@snyk/cocoapods-lockfile-parser" "3.6.2" "@snyk/dep-graph" "^1.23.1" - "source-map-support" "^0.5.7" - "tslib" "^2.0.0" + source-map-support "^0.5.7" + tslib "^2.0.0" "@snyk/snyk-docker-pull@3.2.3": - "integrity" "sha512-hiFiSmWGLc2tOI7FfgIhVdFzO2f69im8O6p3OV4xEZ/Ss1l58vwtqudItoswsk7wj/azRlgfBW8wGu2MjoudQg==" - "resolved" "https://registry.npmjs.org/@snyk/snyk-docker-pull/-/snyk-docker-pull-3.2.3.tgz" - "version" "3.2.3" + version "3.2.3" + resolved "https://registry.npmjs.org/@snyk/snyk-docker-pull/-/snyk-docker-pull-3.2.3.tgz" + integrity sha512-hiFiSmWGLc2tOI7FfgIhVdFzO2f69im8O6p3OV4xEZ/Ss1l58vwtqudItoswsk7wj/azRlgfBW8wGu2MjoudQg== dependencies: "@snyk/docker-registry-v2-client" "1.13.9" - "child-process" "^1.0.2" - "tar-stream" "^2.1.2" - "tmp" "^0.1.0" + child-process "^1.0.2" + tar-stream "^2.1.2" + tmp "^0.1.0" "@snyk/snyk-hex-plugin@1.0.0": - "integrity" "sha512-ZydVdZ5kDpPDoehQnNHN3wZ6c470k5DPLJtWMoyfzlnCU2+y1rsUEdn4yhttn60RPx3JiLGwmckeDvZw8BqnGQ==" - "resolved" "https://registry.npmjs.org/@snyk/snyk-hex-plugin/-/snyk-hex-plugin-1.0.0.tgz" - "version" "1.0.0" + version "1.0.0" + resolved "https://registry.npmjs.org/@snyk/snyk-hex-plugin/-/snyk-hex-plugin-1.0.0.tgz" + integrity sha512-ZydVdZ5kDpPDoehQnNHN3wZ6c470k5DPLJtWMoyfzlnCU2+y1rsUEdn4yhttn60RPx3JiLGwmckeDvZw8BqnGQ== dependencies: "@snyk/dep-graph" "^1.28.0" "@snyk/mix-parser" "^1.1.0" - "debug" "^4.3.1" - "tslib" "^2.0.0" + debug "^4.3.1" + tslib "^2.0.0" "@szmarczak/http-timer@^1.1.2": - "integrity" "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==" - "resolved" "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz" - "version" "1.1.2" + version "1.1.2" + resolved "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz" + integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA== dependencies: - "defer-to-connect" "^1.0.1" + defer-to-connect "^1.0.1" "@szmarczak/http-timer@^4.0.5": - "integrity" "sha512-PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ==" - "resolved" "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.5.tgz" - "version" "4.0.5" + version "4.0.5" + resolved "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.5.tgz" + integrity sha512-PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ== dependencies: - "defer-to-connect" "^2.0.0" + defer-to-connect "^2.0.0" "@types/babel-types@*", "@types/babel-types@^7.0.0": version "7.0.9" @@ -445,14 +397,14 @@ "@types/babel-types" "*" "@types/braces@*": - "integrity" "sha512-TbH79tcyi9FHwbyboOKeRachRq63mSuWYXOflsNO9ZyE5ClQ/JaozNKl+aWUq87qPNsXasXxi2AbgfwIJ+8GQw==" - "resolved" "https://registry.npmjs.org/@types/braces/-/braces-3.0.0.tgz" - "version" "3.0.0" + version "3.0.0" + resolved "https://registry.npmjs.org/@types/braces/-/braces-3.0.0.tgz" + integrity sha512-TbH79tcyi9FHwbyboOKeRachRq63mSuWYXOflsNO9ZyE5ClQ/JaozNKl+aWUq87qPNsXasXxi2AbgfwIJ+8GQw== "@types/cacheable-request@^6.0.1": - "integrity" "sha512-ykFq2zmBGOCbpIXtoVbz4SKY5QriWPh3AjyU4G74RYbtt5yOc5OfaY75ftjg7mikMOla1CTGpX3lLbuJh8DTrQ==" - "resolved" "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.1.tgz" - "version" "6.0.1" + version "6.0.1" + resolved "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.1.tgz" + integrity sha512-ykFq2zmBGOCbpIXtoVbz4SKY5QriWPh3AjyU4G74RYbtt5yOc5OfaY75ftjg7mikMOla1CTGpX3lLbuJh8DTrQ== dependencies: "@types/http-cache-semantics" "*" "@types/keyv" "*" @@ -460,106 +412,101 @@ "@types/responselike" "*" "@types/color-name@^1.1.1": - "integrity" "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==" - "resolved" "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz" - "version" "1.1.1" + version "1.1.1" + resolved "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz" + integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ== "@types/debug@^4.1.4": - "integrity" "sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ==" - "resolved" "https://registry.npmjs.org/@types/debug/-/debug-4.1.5.tgz" - "version" "4.1.5" + version "4.1.5" + resolved "https://registry.npmjs.org/@types/debug/-/debug-4.1.5.tgz" + integrity sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ== "@types/flat-cache@^2.0.0": - "integrity" "sha512-fHeEsm9hvmZ+QHpw6Fkvf19KIhuqnYLU6vtWLjd5BsMd/qVi7iTkMioDZl0mQmfNRA1A6NwvhrSRNr9hGYZGww==" - "resolved" "https://registry.npmjs.org/@types/flat-cache/-/flat-cache-2.0.0.tgz" - "version" "2.0.0" + version "2.0.0" + resolved "https://registry.npmjs.org/@types/flat-cache/-/flat-cache-2.0.0.tgz" + integrity sha512-fHeEsm9hvmZ+QHpw6Fkvf19KIhuqnYLU6vtWLjd5BsMd/qVi7iTkMioDZl0mQmfNRA1A6NwvhrSRNr9hGYZGww== "@types/graphlib@^2", "@types/graphlib@^2.1.7": - "integrity" "sha512-K7T1n6U2HbTYu+SFHlBjz/RH74OA2D/zF1qlzn8uXbvB4uRg7knOM85ugS2bbXI1TXMh7rLqk4OVRwIwEBaixg==" - "resolved" "https://registry.npmjs.org/@types/graphlib/-/graphlib-2.1.7.tgz" - "version" "2.1.7" + version "2.1.7" + resolved "https://registry.npmjs.org/@types/graphlib/-/graphlib-2.1.7.tgz" + integrity sha512-K7T1n6U2HbTYu+SFHlBjz/RH74OA2D/zF1qlzn8uXbvB4uRg7knOM85ugS2bbXI1TXMh7rLqk4OVRwIwEBaixg== "@types/http-cache-semantics@*": - "integrity" "sha512-c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A==" - "resolved" "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.0.tgz" - "version" "4.0.0" + version "4.0.0" + resolved "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.0.tgz" + integrity sha512-c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A== "@types/js-yaml@^3.12.1": - "integrity" "sha512-0CFu/g4mDSNkodVwWijdlr8jH7RoplRWNgovjFLEZeT+QEbbZXjBmCe3HwaWheAlCbHwomTwzZoSedeOycABug==" - "resolved" "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.12.2.tgz" - "version" "3.12.2" + version "3.12.2" + resolved "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.12.2.tgz" + integrity sha512-0CFu/g4mDSNkodVwWijdlr8jH7RoplRWNgovjFLEZeT+QEbbZXjBmCe3HwaWheAlCbHwomTwzZoSedeOycABug== "@types/keyv@*": - "integrity" "sha512-MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw==" - "resolved" "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.1.tgz" - "version" "3.1.1" + version "3.1.1" + resolved "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.1.tgz" + integrity sha512-MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw== dependencies: "@types/node" "*" "@types/lodash.chunk@^4.2.6": - "integrity" "sha512-SPlusB7jxXyGcTXYcUdWr7WmhArO/rmTq54VN88iKMxGUhyg79I4Q8n4riGn3kjaTjOJrVlHhxgX/d7woak5BQ==" - "resolved" "https://registry.npmjs.org/@types/lodash.chunk/-/lodash.chunk-4.2.6.tgz" - "version" "4.2.6" + version "4.2.6" + resolved "https://registry.npmjs.org/@types/lodash.chunk/-/lodash.chunk-4.2.6.tgz" + integrity sha512-SPlusB7jxXyGcTXYcUdWr7WmhArO/rmTq54VN88iKMxGUhyg79I4Q8n4riGn3kjaTjOJrVlHhxgX/d7woak5BQ== dependencies: "@types/lodash" "*" "@types/lodash.omit@^4.5.6": - "integrity" "sha512-KXPpOSNX2h0DAG2w7ajpk7TXvWF28ZHs5nJhOJyP0BQHkehgr948RVsToItMme6oi0XJkp19CbuNXkIX8FiBlQ==" - "resolved" "https://registry.npmjs.org/@types/lodash.omit/-/lodash.omit-4.5.6.tgz" - "version" "4.5.6" + version "4.5.6" + resolved "https://registry.npmjs.org/@types/lodash.omit/-/lodash.omit-4.5.6.tgz" + integrity sha512-KXPpOSNX2h0DAG2w7ajpk7TXvWF28ZHs5nJhOJyP0BQHkehgr948RVsToItMme6oi0XJkp19CbuNXkIX8FiBlQ== dependencies: "@types/lodash" "*" "@types/lodash.union@^4.6.6": - "integrity" "sha512-Wu0ZEVNcyCz8eAn6TlUbYWZoGbH9E+iOHxAZbwUoCEXdUiy6qpcz5o44mMXViM4vlPLLCPlkAubEP1gokoSZaw==" - "resolved" "https://registry.npmjs.org/@types/lodash.union/-/lodash.union-4.6.6.tgz" - "version" "4.6.6" + version "4.6.6" + resolved "https://registry.npmjs.org/@types/lodash.union/-/lodash.union-4.6.6.tgz" + integrity sha512-Wu0ZEVNcyCz8eAn6TlUbYWZoGbH9E+iOHxAZbwUoCEXdUiy6qpcz5o44mMXViM4vlPLLCPlkAubEP1gokoSZaw== dependencies: "@types/lodash" "*" "@types/lodash@*": - "integrity" "sha512-oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q==" - "resolved" "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.168.tgz" - "version" "4.14.168" + version "4.14.168" + resolved "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.168.tgz" + integrity sha512-oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q== "@types/micromatch@^4.0.1": - "integrity" "sha512-my6fLBvpY70KattTNzYOK6KU1oR1+UCz9ug/JbcF5UrEmeCt9P7DV2t7L8+t18mMPINqGQCE4O8PLOPbI84gxw==" - "resolved" "https://registry.npmjs.org/@types/micromatch/-/micromatch-4.0.1.tgz" - "version" "4.0.1" + version "4.0.1" + resolved "https://registry.npmjs.org/@types/micromatch/-/micromatch-4.0.1.tgz" + integrity sha512-my6fLBvpY70KattTNzYOK6KU1oR1+UCz9ug/JbcF5UrEmeCt9P7DV2t7L8+t18mMPINqGQCE4O8PLOPbI84gxw== dependencies: "@types/braces" "*" "@types/node@*": - "integrity" "sha512-oVeL12C6gQS/GAExndigSaLxTrKpQPxewx9bOcwfvJiJge4rr7wNaph4J+ns5hrmIV2as5qxqN8YKthn9qh0jw==" - "resolved" "https://registry.npmjs.org/@types/node/-/node-13.7.4.tgz" - "version" "13.7.4" + version "13.7.4" + resolved "https://registry.npmjs.org/@types/node/-/node-13.7.4.tgz" + integrity sha512-oVeL12C6gQS/GAExndigSaLxTrKpQPxewx9bOcwfvJiJge4rr7wNaph4J+ns5hrmIV2as5qxqN8YKthn9qh0jw== "@types/q@^1.5.1": - "integrity" "sha512-eqz8c/0kwNi/OEHQfvIuJVLTst3in0e7uTKeuY+WL/zfKn0xVujOTp42bS/vUUokhK5P2BppLd9JXMOMHcgbjA==" - "resolved" "https://registry.npmjs.org/@types/q/-/q-1.5.1.tgz" - "version" "1.5.1" + version "1.5.1" + resolved "https://registry.npmjs.org/@types/q/-/q-1.5.1.tgz" + integrity sha512-eqz8c/0kwNi/OEHQfvIuJVLTst3in0e7uTKeuY+WL/zfKn0xVujOTp42bS/vUUokhK5P2BppLd9JXMOMHcgbjA== "@types/responselike@*", "@types/responselike@^1.0.0": - "integrity" "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==" - "resolved" "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz" - "version" "1.0.0" + version "1.0.0" + resolved "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz" + integrity sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA== dependencies: "@types/node" "*" "@types/sarif@^2.1.3": - "integrity" "sha512-zf+EoIplTkQW2TV2mwtJtlI0g540Z3Rs9tX9JqRAtyjnDCqkP+eMTgWCj3PGNbQpi+WXAjvC3Ou/dvvX2sLK4w==" - "resolved" "https://registry.npmjs.org/@types/sarif/-/sarif-2.1.3.tgz" - "version" "2.1.3" + version "2.1.3" + resolved "https://registry.npmjs.org/@types/sarif/-/sarif-2.1.3.tgz" + integrity sha512-zf+EoIplTkQW2TV2mwtJtlI0g540Z3Rs9tX9JqRAtyjnDCqkP+eMTgWCj3PGNbQpi+WXAjvC3Ou/dvvX2sLK4w== "@types/uuid@^8.3.0": - "integrity" "sha512-eQ9qFW/fhfGJF8WKHGEHZEyVWfZxrT+6CLIJGBcZPfxUh/+BnEj+UCGYMlr9qZuX/2AltsvwrGqp0LhEW8D0zQ==" - "resolved" "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.0.tgz" - "version" "8.3.0" - -"editorjs-undo@^0.1.6": - "integrity" "sha512-zVHPnBf2mcI8hWT9Eu8H3bGDEcMj4gppXbQjJW11Aa8Kdy2SVBGhM6fS59OUlBsm8iHWLxuoG2NUIfy9Rd30sw==" - "resolved" "https://registry.npmjs.org/editorjs-undo/-/editorjs-undo-0.1.6.tgz" - "version" "0.1.6" + version "8.3.0" + resolved "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.0.tgz" + integrity sha512-eQ9qFW/fhfGJF8WKHGEHZEyVWfZxrT+6CLIJGBcZPfxUh/+BnEj+UCGYMlr9qZuX/2AltsvwrGqp0LhEW8D0zQ== "@vue/component-compiler-utils@^3.0.0": version "3.2.0" @@ -1403,6 +1350,16 @@ code-point-at@^1.0.0: resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= +codex-notifier@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/codex-notifier/-/codex-notifier-1.1.2.tgz#a733079185f4c927fa296f1d71eb8753fe080895" + integrity sha512-DCp6xe/LGueJ1N5sXEwcBc3r3PyVkEEDNWCVigfvywAkeXcZMk9K41a31tkEFBW0Ptlwji6/JlAb49E3Yrxbtg== + +codex-tooltip@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/codex-tooltip/-/codex-tooltip-1.0.2.tgz#81a9d3e2937658c6e5312106b47b9f094ff7be63" + integrity sha512-oC+Bu5X/zyhbPydgMSLWKoM/+vkJMqaLWu3Dt/jZgXS3MWK23INwC5DMBrVXZSufAFk0i0SUni38k9rLMyZn/w== + color-convert@^1.9.0, color-convert@^1.9.1: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" @@ -2079,6 +2036,11 @@ ecc-jsbn@~0.1.1: jsbn "~0.1.0" safer-buffer "^2.1.0" +editorjs-undo@^0.1.6: + version "0.1.6" + resolved "https://registry.npmjs.org/editorjs-undo/-/editorjs-undo-0.1.6.tgz" + integrity sha512-zVHPnBf2mcI8hWT9Eu8H3bGDEcMj4gppXbQjJW11Aa8Kdy2SVBGhM6fS59OUlBsm8iHWLxuoG2NUIfy9Rd30sw== + ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" @@ -3747,7 +3709,7 @@ latest-version@^5.0.0: resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA== dependencies: - "package-json" "^6.3.0" + package-json "^6.3.0" launch-editor@^2.2.1: version "2.2.1" @@ -4547,13 +4509,6 @@ node-sass@^4.14.1: stdout-stream "^1.4.0" "true-case-path" "^1.0.2" -"nopt@~1.0.10": - "integrity" "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=" - "resolved" "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz" - "version" "1.0.10" - dependencies: - "abbrev" "1" - "nopt@2 || 3": version "3.0.6" resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" @@ -6323,271 +6278,271 @@ snyk-cpp-plugin@2.2.1: integrity sha512-NFwVLMCqKTocY66gcim0ukF6e31VRDJqDapg5sy3vCHqlD1OCNUXSK/aI4VQEEndDrsnFmQepsL5KpEU0dDRIQ== dependencies: "@snyk/dep-graph" "^1.19.3" - "chalk" "^4.1.0" - "debug" "^4.1.1" - "hosted-git-info" "^3.0.7" - "tslib" "^2.0.0" + chalk "^4.1.0" + debug "^4.1.1" + hosted-git-info "^3.0.7" + tslib "^2.0.0" -"snyk-docker-plugin@4.19.3": - "integrity" "sha512-5WkXyT7uY5NrTOvEqxeMqb6dDcskT3c/gbHUTOyPuvE6tMut+OOYK8RRXbwZFeLzpS8asq4e1R7U7syYG3VXwg==" - "resolved" "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.19.3.tgz" - "version" "4.19.3" +snyk-docker-plugin@4.19.3: + version "4.19.3" + resolved "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.19.3.tgz" + integrity sha512-5WkXyT7uY5NrTOvEqxeMqb6dDcskT3c/gbHUTOyPuvE6tMut+OOYK8RRXbwZFeLzpS8asq4e1R7U7syYG3VXwg== dependencies: "@snyk/dep-graph" "^1.21.0" "@snyk/rpm-parser" "^2.0.0" "@snyk/snyk-docker-pull" "3.2.3" - "chalk" "^2.4.2" - "debug" "^4.1.1" - "docker-modem" "2.1.3" - "dockerfile-ast" "0.2.0" - "elfy" "^1.0.0" - "event-loop-spinner" "^2.0.0" - "gunzip-maybe" "^1.4.2" - "mkdirp" "^1.0.4" - "semver" "^7.3.4" - "snyk-nodejs-lockfile-parser" "1.30.2" - "tar-stream" "^2.1.0" - "tmp" "^0.2.1" - "tslib" "^1" - "uuid" "^8.2.0" - -"snyk-go-parser@1.4.1": - "integrity" "sha512-StU3uHB85VMEkcgXta63M0Fgd+9cs5sMCjQXTBoYTdE4dxarPn7U67yCuwkRRdZdny1ZXtzfY8LKns9i0+dy9w==" - "resolved" "https://registry.npmjs.org/snyk-go-parser/-/snyk-go-parser-1.4.1.tgz" - "version" "1.4.1" - dependencies: - "toml" "^3.0.0" - "tslib" "^1.10.0" - -"snyk-go-plugin@1.17.0": - "integrity" "sha512-1jAYPRgMapO2BYL+HWsUq5gsAiDGmI0Pn7omc0lk24tcUOMhUB+1hb0u9WBMNzHvXBjevBkjOctjpnt2hMKN6Q==" - "resolved" "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.17.0.tgz" - "version" "1.17.0" + chalk "^2.4.2" + debug "^4.1.1" + docker-modem "2.1.3" + dockerfile-ast "0.2.0" + elfy "^1.0.0" + event-loop-spinner "^2.0.0" + gunzip-maybe "^1.4.2" + mkdirp "^1.0.4" + semver "^7.3.4" + snyk-nodejs-lockfile-parser "1.30.2" + tar-stream "^2.1.0" + tmp "^0.2.1" + tslib "^1" + uuid "^8.2.0" + +snyk-go-parser@1.4.1: + version "1.4.1" + resolved "https://registry.npmjs.org/snyk-go-parser/-/snyk-go-parser-1.4.1.tgz" + integrity sha512-StU3uHB85VMEkcgXta63M0Fgd+9cs5sMCjQXTBoYTdE4dxarPn7U67yCuwkRRdZdny1ZXtzfY8LKns9i0+dy9w== + dependencies: + toml "^3.0.0" + tslib "^1.10.0" + +snyk-go-plugin@1.17.0: + version "1.17.0" + resolved "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.17.0.tgz" + integrity sha512-1jAYPRgMapO2BYL+HWsUq5gsAiDGmI0Pn7omc0lk24tcUOMhUB+1hb0u9WBMNzHvXBjevBkjOctjpnt2hMKN6Q== dependencies: "@snyk/dep-graph" "^1.23.1" "@snyk/graphlib" "2.1.9-patch.3" - "debug" "^4.1.1" - "snyk-go-parser" "1.4.1" - "tmp" "0.2.1" - "tslib" "^1.10.0" + debug "^4.1.1" + snyk-go-parser "1.4.1" + tmp "0.2.1" + tslib "^1.10.0" -"snyk-gradle-plugin@3.14.0": - "integrity" "sha512-2A8ifM91TyzSx/U2fYvHXbaCRVsEx60hGFQjbSH9Hl9AokxEzMi2qti7wsObs1jUX2m198D1mdXu4k/Y1jWxXg==" - "resolved" "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.14.0.tgz" - "version" "3.14.0" +snyk-gradle-plugin@3.14.0: + version "3.14.0" + resolved "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.14.0.tgz" + integrity sha512-2A8ifM91TyzSx/U2fYvHXbaCRVsEx60hGFQjbSH9Hl9AokxEzMi2qti7wsObs1jUX2m198D1mdXu4k/Y1jWxXg== dependencies: "@snyk/cli-interface" "2.11.0" "@snyk/dep-graph" "^1.28.0" "@snyk/java-call-graph-builder" "1.20.0" "@types/debug" "^4.1.4" - "chalk" "^3.0.0" - "debug" "^4.1.1" - "tmp" "0.2.1" - "tslib" "^2.0.0" + chalk "^3.0.0" + debug "^4.1.1" + tmp "0.2.1" + tslib "^2.0.0" -"snyk-module@^3.0.0", "snyk-module@^3.1.0", "snyk-module@3.1.0": - "integrity" "sha512-HHuOYEAACpUpkFgU8HT57mmxmonaJ4O3YADoSkVhnhkmJ+AowqZyJOau703dYHNrq2DvQ7qYw81H7yyxS1Nfjw==" - "resolved" "https://registry.npmjs.org/snyk-module/-/snyk-module-3.1.0.tgz" - "version" "3.1.0" +snyk-module@3.1.0, snyk-module@^3.0.0, snyk-module@^3.1.0: + version "3.1.0" + resolved "https://registry.npmjs.org/snyk-module/-/snyk-module-3.1.0.tgz" + integrity sha512-HHuOYEAACpUpkFgU8HT57mmxmonaJ4O3YADoSkVhnhkmJ+AowqZyJOau703dYHNrq2DvQ7qYw81H7yyxS1Nfjw== dependencies: - "debug" "^4.1.1" - "hosted-git-info" "^3.0.4" + debug "^4.1.1" + hosted-git-info "^3.0.4" -"snyk-mvn-plugin@2.25.3": - "integrity" "sha512-JAxOThX51JDbgMMjp3gQDVi07G9VgTYSF06QC7f5LNA0zoXNr743e2rm78RGw5bqE3JRjZxEghiLHPPuvS5DDg==" - "resolved" "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.25.3.tgz" - "version" "2.25.3" +snyk-mvn-plugin@2.25.3: + version "2.25.3" + resolved "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.25.3.tgz" + integrity sha512-JAxOThX51JDbgMMjp3gQDVi07G9VgTYSF06QC7f5LNA0zoXNr743e2rm78RGw5bqE3JRjZxEghiLHPPuvS5DDg== dependencies: "@snyk/cli-interface" "2.11.0" "@snyk/dep-graph" "^1.23.1" "@snyk/java-call-graph-builder" "1.19.1" - "debug" "^4.1.1" - "glob" "^7.1.6" - "needle" "^2.5.0" - "tmp" "^0.1.0" - "tslib" "1.11.1" + debug "^4.1.1" + glob "^7.1.6" + needle "^2.5.0" + tmp "^0.1.0" + tslib "1.11.1" -"snyk-nodejs-lockfile-parser@1.30.2": - "integrity" "sha512-wI3VXVYO/ok0uaQm5i+Koo4rKBNilYC/QRIQFlyGbZXf+WBdRcTBKVDfTy8uNfUhMRSGzd84lNclMnetU9Y+vw==" - "resolved" "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.30.2.tgz" - "version" "1.30.2" +snyk-nodejs-lockfile-parser@1.30.2: + version "1.30.2" + resolved "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.30.2.tgz" + integrity sha512-wI3VXVYO/ok0uaQm5i+Koo4rKBNilYC/QRIQFlyGbZXf+WBdRcTBKVDfTy8uNfUhMRSGzd84lNclMnetU9Y+vw== dependencies: "@snyk/graphlib" "2.1.9-patch.3" "@yarnpkg/lockfile" "^1.1.0" - "event-loop-spinner" "^2.0.0" - "got" "11.4.0" - "lodash.clonedeep" "^4.5.0" - "lodash.flatmap" "^4.5.0" - "lodash.isempty" "^4.4.0" - "lodash.set" "^4.3.2" - "lodash.topairs" "^4.3.0" - "p-map" "2.1.0" - "snyk-config" "^4.0.0-rc.2" - "tslib" "^1.9.3" - "uuid" "^8.3.0" - "yaml" "^1.9.2" - -"snyk-nodejs-lockfile-parser@1.31.1": - "integrity" "sha512-MU1V2zS5ziLGMUL6PXxPvJuZ281wvawjQQ1c8TW697Jjkhd8hPZcW4IzMu52ok0zsmQcVZh8sVniBEHIePCfLQ==" - "resolved" "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.31.1.tgz" - "version" "1.31.1" + event-loop-spinner "^2.0.0" + got "11.4.0" + lodash.clonedeep "^4.5.0" + lodash.flatmap "^4.5.0" + lodash.isempty "^4.4.0" + lodash.set "^4.3.2" + lodash.topairs "^4.3.0" + p-map "2.1.0" + snyk-config "^4.0.0-rc.2" + tslib "^1.9.3" + uuid "^8.3.0" + yaml "^1.9.2" + +snyk-nodejs-lockfile-parser@1.31.1: + version "1.31.1" + resolved "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.31.1.tgz" + integrity sha512-MU1V2zS5ziLGMUL6PXxPvJuZ281wvawjQQ1c8TW697Jjkhd8hPZcW4IzMu52ok0zsmQcVZh8sVniBEHIePCfLQ== dependencies: "@snyk/graphlib" "2.1.9-patch.3" "@yarnpkg/lockfile" "^1.1.0" - "event-loop-spinner" "^2.0.0" - "got" "11.4.0" - "lodash.clonedeep" "^4.5.0" - "lodash.flatmap" "^4.5.0" - "lodash.isempty" "^4.4.0" - "lodash.set" "^4.3.2" - "lodash.topairs" "^4.3.0" - "p-map" "2.1.0" - "snyk-config" "^4.0.0-rc.2" - "tslib" "^1.9.3" - "uuid" "^8.3.0" - "yaml" "^1.9.2" - -"snyk-nuget-plugin@1.21.0": - "integrity" "sha512-c/JYF3sZzMN/lYz171zrEkVcPqDVcUTVgKIKHiL8nhhuFKxZQ1gzqOgk+lnfN31TLoTNQsZ3DhW/WY+4zEALvw==" - "resolved" "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.21.0.tgz" - "version" "1.21.0" - dependencies: - "debug" "^4.1.1" - "dotnet-deps-parser" "5.0.0" - "jszip" "3.4.0" - "snyk-paket-parser" "1.6.0" - "tslib" "^1.11.2" - "xml2js" "^0.4.17" - -"snyk-paket-parser@1.6.0": - "integrity" "sha512-6htFynjBe/nakclEHUZ1A3j5Eu32/0pNve5Qm4MFn3YQmJgj7UcAO8hdyK3QfzEY29/kAv/rkJQg+SKshn+N9Q==" - "resolved" "https://registry.npmjs.org/snyk-paket-parser/-/snyk-paket-parser-1.6.0.tgz" - "version" "1.6.0" - dependencies: - "tslib" "^1.9.3" - -"snyk-php-plugin@1.9.2": - "integrity" "sha512-IQcdsQBqqXVRY5DatlI7ASy4flbhtU2V7cr4P2rK9rkFnVHO6LHcitwKXVZa9ocdOmpZDzk7U6iwHJkVFcR6OA==" - "resolved" "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.9.2.tgz" - "version" "1.9.2" + event-loop-spinner "^2.0.0" + got "11.4.0" + lodash.clonedeep "^4.5.0" + lodash.flatmap "^4.5.0" + lodash.isempty "^4.4.0" + lodash.set "^4.3.2" + lodash.topairs "^4.3.0" + p-map "2.1.0" + snyk-config "^4.0.0-rc.2" + tslib "^1.9.3" + uuid "^8.3.0" + yaml "^1.9.2" + +snyk-nuget-plugin@1.21.0: + version "1.21.0" + resolved "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.21.0.tgz" + integrity sha512-c/JYF3sZzMN/lYz171zrEkVcPqDVcUTVgKIKHiL8nhhuFKxZQ1gzqOgk+lnfN31TLoTNQsZ3DhW/WY+4zEALvw== + dependencies: + debug "^4.1.1" + dotnet-deps-parser "5.0.0" + jszip "3.4.0" + snyk-paket-parser "1.6.0" + tslib "^1.11.2" + xml2js "^0.4.17" + +snyk-paket-parser@1.6.0: + version "1.6.0" + resolved "https://registry.npmjs.org/snyk-paket-parser/-/snyk-paket-parser-1.6.0.tgz" + integrity sha512-6htFynjBe/nakclEHUZ1A3j5Eu32/0pNve5Qm4MFn3YQmJgj7UcAO8hdyK3QfzEY29/kAv/rkJQg+SKshn+N9Q== + dependencies: + tslib "^1.9.3" + +snyk-php-plugin@1.9.2: + version "1.9.2" + resolved "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.9.2.tgz" + integrity sha512-IQcdsQBqqXVRY5DatlI7ASy4flbhtU2V7cr4P2rK9rkFnVHO6LHcitwKXVZa9ocdOmpZDzk7U6iwHJkVFcR6OA== dependencies: "@snyk/cli-interface" "^2.9.1" "@snyk/composer-lockfile-parser" "^1.4.1" - "tslib" "1.11.1" + tslib "1.11.1" -"snyk-poetry-lockfile-parser@^1.1.6": - "integrity" "sha512-MoekbWOZPj9umfukjk2bd2o3eRj0OyO+58sxq9crMtHmTlze4h0/Uj4+fb0JFPBOtBO3c2zwbA+dvFQmpKoOTA==" - "resolved" "https://registry.npmjs.org/snyk-poetry-lockfile-parser/-/snyk-poetry-lockfile-parser-1.1.6.tgz" - "version" "1.1.6" +snyk-poetry-lockfile-parser@^1.1.6: + version "1.1.6" + resolved "https://registry.npmjs.org/snyk-poetry-lockfile-parser/-/snyk-poetry-lockfile-parser-1.1.6.tgz" + integrity sha512-MoekbWOZPj9umfukjk2bd2o3eRj0OyO+58sxq9crMtHmTlze4h0/Uj4+fb0JFPBOtBO3c2zwbA+dvFQmpKoOTA== dependencies: "@snyk/cli-interface" "^2.9.2" "@snyk/dep-graph" "^1.23.0" - "debug" "^4.2.0" - "toml" "^3.0.0" - "tslib" "^2.0.0" - -"snyk-policy@1.19.0": - "integrity" "sha512-XYjhOTRPFA7NfDUsH6uH1fbML2OgSFsqdUPbud7x01urNP9CHXgUgAD4NhKMi3dVQK+7IdYadWt0wrFWw4y+qg==" - "resolved" "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.19.0.tgz" - "version" "1.19.0" - dependencies: - "debug" "^4.1.1" - "email-validator" "^2.0.4" - "js-yaml" "^3.13.1" - "lodash.clonedeep" "^4.5.0" - "promise-fs" "^2.1.1" - "semver" "^6.0.0" - "snyk-module" "^3.0.0" - "snyk-resolve" "^1.1.0" - "snyk-try-require" "^2.0.0" - -"snyk-python-plugin@1.19.7": - "integrity" "sha512-twAGoIgJVSLVzMkuT/n5l9ZDvhMbWH7De6flWiHQB/grthfl3vJDzLCxiTa+6H/IEEYNSv6F/nSrfNh9UbW5/A==" - "resolved" "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.19.7.tgz" - "version" "1.19.7" + debug "^4.2.0" + toml "^3.0.0" + tslib "^2.0.0" + +snyk-policy@1.19.0: + version "1.19.0" + resolved "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.19.0.tgz" + integrity sha512-XYjhOTRPFA7NfDUsH6uH1fbML2OgSFsqdUPbud7x01urNP9CHXgUgAD4NhKMi3dVQK+7IdYadWt0wrFWw4y+qg== + dependencies: + debug "^4.1.1" + email-validator "^2.0.4" + js-yaml "^3.13.1" + lodash.clonedeep "^4.5.0" + promise-fs "^2.1.1" + semver "^6.0.0" + snyk-module "^3.0.0" + snyk-resolve "^1.1.0" + snyk-try-require "^2.0.0" + +snyk-python-plugin@1.19.7: + version "1.19.7" + resolved "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.19.7.tgz" + integrity sha512-twAGoIgJVSLVzMkuT/n5l9ZDvhMbWH7De6flWiHQB/grthfl3vJDzLCxiTa+6H/IEEYNSv6F/nSrfNh9UbW5/A== dependencies: "@snyk/cli-interface" "^2.0.3" - "snyk-poetry-lockfile-parser" "^1.1.6" - "tmp" "0.0.33" - -"snyk-resolve-deps@4.7.2": - "integrity" "sha512-Bmtr7QdRL2b3Js+mPDmvXbkprOpzO8aUFXqR0nJKAOlUVQqZ84yiuT0n/mssEiJJ0vP+k0kZvTeiTwgio4KZRg==" - "resolved" "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-4.7.2.tgz" - "version" "4.7.2" - dependencies: - "ansicolors" "^0.3.2" - "debug" "^4.1.1" - "lodash.assign" "^4.2.0" - "lodash.assignin" "^4.2.0" - "lodash.clone" "^4.5.0" - "lodash.flatten" "^4.4.0" - "lodash.get" "^4.4.2" - "lodash.set" "^4.3.2" - "lru-cache" "^4.0.0" - "semver" "^5.5.1" - "snyk-module" "^3.1.0" - "snyk-resolve" "^1.0.0" - "snyk-tree" "^1.0.0" - "snyk-try-require" "^1.1.1" - "then-fs" "^2.0.0" - -"snyk-resolve@^1.0.0": - "integrity" "sha512-7+i+LLhtBo1Pkth01xv+RYJU8a67zmJ8WFFPvSxyCjdlKIcsps4hPQFebhz+0gC5rMemlaeIV6cqwqUf9PEDpw==" - "resolved" "https://registry.npmjs.org/snyk-resolve/-/snyk-resolve-1.0.1.tgz" - "version" "1.0.1" - dependencies: - "debug" "^3.1.0" - "then-fs" "^2.0.0" - -"snyk-resolve@^1.1.0", "snyk-resolve@1.1.0": - "integrity" "sha512-OZMF8I8TOu0S58Z/OS9mr8jkEzGAPByCsAkrWlcmZgPaE0RsxVKVIFPhbMNy/JlYswgGDYYIEsNw+e0j1FnTrw==" - "resolved" "https://registry.npmjs.org/snyk-resolve/-/snyk-resolve-1.1.0.tgz" - "version" "1.1.0" - dependencies: - "debug" "^4.1.1" - "promise-fs" "^2.1.1" - -"snyk-sbt-plugin@2.11.0": - "integrity" "sha512-wUqHLAa3MzV6sVO+05MnV+lwc+T6o87FZZaY+43tQPytBI2Wq23O3j4POREM4fa2iFfiQJoEYD6c7xmhiEUsSA==" - "resolved" "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-2.11.0.tgz" - "version" "2.11.0" - dependencies: - "debug" "^4.1.1" - "semver" "^6.1.2" - "tmp" "^0.1.0" - "tree-kill" "^1.2.2" - "tslib" "^1.10.0" - -"snyk-tree@^1.0.0": - "integrity" "sha1-D7cxdtvzLngvGRAClBYESPkRHMg=" - "resolved" "https://registry.npmjs.org/snyk-tree/-/snyk-tree-1.0.0.tgz" - "version" "1.0.0" - dependencies: - "archy" "^1.0.0" - -"snyk-try-require@^1.1.1", "snyk-try-require@1.3.1": - "integrity" "sha1-bgJvkuZK9/zM6h7lPVJIQeQYohI=" - "resolved" "https://registry.npmjs.org/snyk-try-require/-/snyk-try-require-1.3.1.tgz" - "version" "1.3.1" - dependencies: - "debug" "^3.1.0" - "lodash.clonedeep" "^4.3.0" - "lru-cache" "^4.0.0" - "then-fs" "^2.0.0" - -"snyk-try-require@^2.0.0": - "integrity" "sha512-VCOfFIvqLMXgCXEdooQgu3A40XYIFBnj0X8Y01RJ5iAbu08b4WKGN/uAKaRVF30dABS4EcjsalmCO+YlKUPEIA==" - "resolved" "https://registry.npmjs.org/snyk-try-require/-/snyk-try-require-2.0.1.tgz" - "version" "2.0.1" - dependencies: - "debug" "^4.1.1" - "lodash.clonedeep" "^4.3.0" - "lru-cache" "^5.1.1" - -"snyk@^1.518.0": - "integrity" "sha512-+NSZDb1sbG+AxzK//GLAKHF0oyPyDlUzQgwy8tyet4tiUsnDKKEruCsX4R9c0outy5qfAExKG77aZego3N9p/Q==" - "resolved" "https://registry.npmjs.org/snyk/-/snyk-1.520.0.tgz" - "version" "1.520.0" + snyk-poetry-lockfile-parser "^1.1.6" + tmp "0.0.33" + +snyk-resolve-deps@4.7.2: + version "4.7.2" + resolved "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-4.7.2.tgz" + integrity sha512-Bmtr7QdRL2b3Js+mPDmvXbkprOpzO8aUFXqR0nJKAOlUVQqZ84yiuT0n/mssEiJJ0vP+k0kZvTeiTwgio4KZRg== + dependencies: + ansicolors "^0.3.2" + debug "^4.1.1" + lodash.assign "^4.2.0" + lodash.assignin "^4.2.0" + lodash.clone "^4.5.0" + lodash.flatten "^4.4.0" + lodash.get "^4.4.2" + lodash.set "^4.3.2" + lru-cache "^4.0.0" + semver "^5.5.1" + snyk-module "^3.1.0" + snyk-resolve "^1.0.0" + snyk-tree "^1.0.0" + snyk-try-require "^1.1.1" + then-fs "^2.0.0" + +snyk-resolve@1.1.0, snyk-resolve@^1.1.0: + version "1.1.0" + resolved "https://registry.npmjs.org/snyk-resolve/-/snyk-resolve-1.1.0.tgz" + integrity sha512-OZMF8I8TOu0S58Z/OS9mr8jkEzGAPByCsAkrWlcmZgPaE0RsxVKVIFPhbMNy/JlYswgGDYYIEsNw+e0j1FnTrw== + dependencies: + debug "^4.1.1" + promise-fs "^2.1.1" + +snyk-resolve@^1.0.0: + version "1.0.1" + resolved "https://registry.npmjs.org/snyk-resolve/-/snyk-resolve-1.0.1.tgz" + integrity sha512-7+i+LLhtBo1Pkth01xv+RYJU8a67zmJ8WFFPvSxyCjdlKIcsps4hPQFebhz+0gC5rMemlaeIV6cqwqUf9PEDpw== + dependencies: + debug "^3.1.0" + then-fs "^2.0.0" + +snyk-sbt-plugin@2.11.0: + version "2.11.0" + resolved "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-2.11.0.tgz" + integrity sha512-wUqHLAa3MzV6sVO+05MnV+lwc+T6o87FZZaY+43tQPytBI2Wq23O3j4POREM4fa2iFfiQJoEYD6c7xmhiEUsSA== + dependencies: + debug "^4.1.1" + semver "^6.1.2" + tmp "^0.1.0" + tree-kill "^1.2.2" + tslib "^1.10.0" + +snyk-tree@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/snyk-tree/-/snyk-tree-1.0.0.tgz" + integrity sha1-D7cxdtvzLngvGRAClBYESPkRHMg= + dependencies: + archy "^1.0.0" + +snyk-try-require@1.3.1, snyk-try-require@^1.1.1: + version "1.3.1" + resolved "https://registry.npmjs.org/snyk-try-require/-/snyk-try-require-1.3.1.tgz" + integrity sha1-bgJvkuZK9/zM6h7lPVJIQeQYohI= + dependencies: + debug "^3.1.0" + lodash.clonedeep "^4.3.0" + lru-cache "^4.0.0" + then-fs "^2.0.0" + +snyk-try-require@^2.0.0: + version "2.0.1" + resolved "https://registry.npmjs.org/snyk-try-require/-/snyk-try-require-2.0.1.tgz" + integrity sha512-VCOfFIvqLMXgCXEdooQgu3A40XYIFBnj0X8Y01RJ5iAbu08b4WKGN/uAKaRVF30dABS4EcjsalmCO+YlKUPEIA== + dependencies: + debug "^4.1.1" + lodash.clonedeep "^4.3.0" + lru-cache "^5.1.1" + +snyk@^1.518.0: + version "1.520.0" + resolved "https://registry.npmjs.org/snyk/-/snyk-1.520.0.tgz" + integrity sha512-+NSZDb1sbG+AxzK//GLAKHF0oyPyDlUzQgwy8tyet4tiUsnDKKEruCsX4R9c0outy5qfAExKG77aZego3N9p/Q== dependencies: "@open-policy-agent/opa-wasm" "^1.2.0" "@snyk/cli-interface" "2.11.0" @@ -6920,7 +6875,7 @@ string-width@^4.2.0: string.prototype.trimend@^1.0.0: version "1.0.1" - resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913" + resolved "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz" integrity sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g== dependencies: define-properties "^1.1.3" @@ -6928,7 +6883,7 @@ string.prototype.trimend@^1.0.0: string.prototype.trimleft@^2.1.1: version "2.1.2" - resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz#4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc" + resolved "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz" integrity sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw== dependencies: define-properties "^1.1.3" @@ -6937,7 +6892,7 @@ string.prototype.trimleft@^2.1.1: string.prototype.trimright@^2.1.1: version "2.1.2" - resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz#c76f1cef30f21bbad8afeb8db1511496cfb0f2a3" + resolved "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz" integrity sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg== dependencies: define-properties "^1.1.3" @@ -6946,7 +6901,7 @@ string.prototype.trimright@^2.1.1: string.prototype.trimstart@^1.0.0: version "1.0.1" - resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz#14af6d9f34b053f7cfc89b72f8f2ee14b9039a54" + resolved "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz" integrity sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw== dependencies: define-properties "^1.1.3" @@ -6968,59 +6923,59 @@ string_decoder@~1.1.1: strip-ansi@6.0.0, strip-ansi@^6.0.0: version "6.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" + resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz" integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== dependencies: ansi-regex "^5.0.0" strip-ansi@^3.0.0, strip-ansi@^3.0.1: version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz" integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= dependencies: ansi-regex "^2.0.0" strip-ansi@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" + resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz" integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= dependencies: ansi-regex "^3.0.0" strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: version "5.2.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" + resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz" integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== dependencies: ansi-regex "^4.1.0" strip-bom@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e" + resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz" integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4= dependencies: is-utf8 "^0.2.0" strip-eof@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" + resolved "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz" integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= strip-indent@^1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2" + resolved "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz" integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI= dependencies: get-stdin "^4.0.1" strip-json-comments@~2.0.1: version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz" integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= stylehacks@^4.0.0: version "4.0.3" - resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-4.0.3.tgz#6718fcaf4d1e07d8a1318690881e8d96726a71d5" + resolved "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz" integrity sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g== dependencies: browserslist "^4.0.0" @@ -7043,7 +6998,7 @@ stylus@^0.54.5, stylus@^0.x: superagent@^3.8.2: version "3.8.3" - resolved "https://registry.yarnpkg.com/superagent/-/superagent-3.8.3.tgz#460ea0dbdb7d5b11bc4f78deba565f86a178e128" + resolved "https://registry.npmjs.org/superagent/-/superagent-3.8.3.tgz" integrity sha512-GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA== dependencies: component-emitter "^1.2.0" @@ -7059,40 +7014,40 @@ superagent@^3.8.2: supports-color@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" + resolved "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz" integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= supports-color@^3.2.3: version "3.2.3" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6" + resolved "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz" integrity sha1-ZawFBLOVQXHYpklGsq48u4pfVPY= dependencies: has-flag "^1.0.0" supports-color@^5.3.0, supports-color@^5.4.0: version "5.5.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz" integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== dependencies: has-flag "^3.0.0" supports-color@^6.1.0: version "6.1.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3" + resolved "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz" integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ== dependencies: has-flag "^3.0.0" supports-color@^7.1.0: version "7.1.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1" + resolved "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz" integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g== dependencies: has-flag "^4.0.0" svgo@^1.0.0: version "1.2.0" - resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.2.0.tgz#305a8fc0f4f9710828c65039bb93d5793225ffc3" + resolved "https://registry.npmjs.org/svgo/-/svgo-1.2.0.tgz" integrity sha512-xBfxJxfk4UeVN8asec9jNxHiv3UAMv/ujwBWGYvQhhMb2u3YTGKkiybPcLFDLq7GLLWE9wa73e0/m8L5nTzQbw== dependencies: chalk "^2.4.1" @@ -7112,7 +7067,7 @@ svgo@^1.0.0: tar-stream@^2.1.0: version "2.1.0" - resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.0.tgz#d1aaa3661f05b38b5acc9b7020efdca5179a2cc3" + resolved "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.0.tgz" integrity sha512-+DAn4Nb4+gz6WZigRzKEZl1QuJVOLtAwwF+WUxy1fJ6X63CaGaUAxJRD2KEn1OMfcbCjySTYpNC6WmfQoIEOdw== dependencies: bl "^3.0.0" @@ -7123,7 +7078,7 @@ tar-stream@^2.1.0: tar-stream@^2.1.2: version "2.1.3" - resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.3.tgz#1e2022559221b7866161660f118255e20fa79e41" + resolved "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.3.tgz" integrity sha512-Z9yri56Dih8IaK8gncVPx4Wqt86NDmQTSh49XLZgjWpGZL9GK9HKParS2scqHCC4w6X9Gh2jwaU45V47XTKwVA== dependencies: bl "^4.0.1" @@ -7134,7 +7089,7 @@ tar-stream@^2.1.2: tar@^2.0.0: version "2.2.2" - resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40" + resolved "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz" integrity sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA== dependencies: block-stream "*" @@ -7143,7 +7098,7 @@ tar@^2.0.0: tar@^6.1.0: version "6.1.0" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.0.tgz#d1724e9bcc04b977b18d5c573b333a2207229a83" + resolved "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz" integrity sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA== dependencies: chownr "^2.0.0" @@ -7155,17 +7110,17 @@ tar@^6.1.0: temp-dir@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d" + resolved "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz" integrity sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0= temp-dir@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-2.0.0.tgz#bde92b05bdfeb1516e804c9c00ad45177f31321e" + resolved "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz" integrity sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg== tempfile@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-2.0.0.tgz#6b0446856a9b1114d1856ffcbe509cccb0977265" + resolved "https://registry.npmjs.org/tempfile/-/tempfile-2.0.0.tgz" integrity sha1-awRGhWqbERTRhW/8vlCczLCXcmU= dependencies: temp-dir "^1.0.0" @@ -7173,19 +7128,19 @@ tempfile@^2.0.0: term-size@^2.1.0: version "2.2.0" - resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.2.0.tgz#1f16adedfe9bdc18800e1776821734086fcc6753" + resolved "https://registry.npmjs.org/term-size/-/term-size-2.2.0.tgz" integrity sha512-a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw== then-fs@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/then-fs/-/then-fs-2.0.0.tgz#72f792dd9d31705a91ae19ebfcf8b3f968c81da2" + resolved "https://registry.npmjs.org/then-fs/-/then-fs-2.0.0.tgz" integrity sha1-cveS3Z0xcFqRrhnr/Piz+WjIHaI= dependencies: promise ">=3.2 <8" through2@^2.0.3: version "2.0.5" - resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" + resolved "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz" integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== dependencies: readable-stream "~2.3.6" @@ -7193,38 +7148,38 @@ through2@^2.0.3: through@^2.3.4, through@^2.3.6: version "2.3.8" - resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" + resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz" integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= timsort@^0.3.0: version "0.3.0" - resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" + resolved "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz" integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= tmp@0.0.33, tmp@^0.0.33: version "0.0.33" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" + resolved "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz" integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw== dependencies: os-tmpdir "~1.0.2" tmp@0.2.1, tmp@^0.2.1: version "0.2.1" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" + resolved "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz" integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ== dependencies: rimraf "^3.0.0" tmp@^0.1.0: version "0.1.0" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.1.0.tgz#ee434a4e22543082e294ba6201dcc6eafefa2877" + resolved "https://registry.npmjs.org/tmp/-/tmp-0.1.0.tgz" integrity sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw== dependencies: rimraf "^2.6.3" to-array@0.1.4: version "0.1.4" - resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890" + resolved "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz" integrity sha1-F+bBH3PdTz10zaek/zI46a2b+JA= to-fast-properties@^1.0.3: @@ -7234,26 +7189,26 @@ to-fast-properties@^1.0.3: to-object-path@^0.3.0: version "0.3.0" - resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" + resolved "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz" integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68= dependencies: kind-of "^3.0.2" to-readable-stream@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771" + resolved "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz" integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q== to-regex-range@^5.0.1: version "5.0.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + resolved "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz" integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== dependencies: is-number "^7.0.0" toidentifier@1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" + resolved "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz" integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== token-stream@0.0.1: @@ -7263,481 +7218,41 @@ token-stream@0.0.1: toml@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/toml/-/toml-3.0.0.tgz#342160f1af1904ec9d204d03a5d61222d762c5ee" + resolved "https://registry.npmjs.org/toml/-/toml-3.0.0.tgz" integrity sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w== -"string.prototype.trimend@^1.0.0": - "integrity" "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==" - "resolved" "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz" - "version" "1.0.1" - dependencies: - "define-properties" "^1.1.3" - "es-abstract" "^1.17.5" - -"string.prototype.trimleft@^2.1.1": - "integrity" "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==" - "resolved" "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz" - "version" "2.1.2" - dependencies: - "define-properties" "^1.1.3" - "es-abstract" "^1.17.5" - "string.prototype.trimstart" "^1.0.0" - -"string.prototype.trimright@^2.1.1": - "integrity" "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==" - "resolved" "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz" - "version" "2.1.2" - dependencies: - "define-properties" "^1.1.3" - "es-abstract" "^1.17.5" - "string.prototype.trimend" "^1.0.0" - -"string.prototype.trimstart@^1.0.0": - "integrity" "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==" - "resolved" "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz" - "version" "1.0.1" - dependencies: - "define-properties" "^1.1.3" - "es-abstract" "^1.17.5" - -"strip-ansi@^3.0.0", "strip-ansi@^3.0.1": - "integrity" "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=" - "resolved" "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz" - "version" "3.0.1" - dependencies: - "ansi-regex" "^2.0.0" - -"strip-ansi@^4.0.0": - "integrity" "sha1-qEeQIusaw2iocTibY1JixQXuNo8=" - "resolved" "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz" - "version" "4.0.0" - dependencies: - "ansi-regex" "^3.0.0" - -"strip-ansi@^5.0.0": - "integrity" "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==" - "resolved" "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz" - "version" "5.2.0" - dependencies: - "ansi-regex" "^4.1.0" - -"strip-ansi@^5.1.0": - "integrity" "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==" - "resolved" "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz" - "version" "5.2.0" - dependencies: - "ansi-regex" "^4.1.0" - -"strip-ansi@^5.2.0": - "integrity" "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==" - "resolved" "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz" - "version" "5.2.0" - dependencies: - "ansi-regex" "^4.1.0" - -"strip-ansi@^6.0.0": - "integrity" "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==" - "resolved" "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz" - "version" "6.0.0" - dependencies: - "ansi-regex" "^5.0.0" - -"strip-ansi@6.0.0": - "integrity" "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==" - "resolved" "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz" - "version" "6.0.0" +touch@^3.1.0: + version "3.1.0" + resolved "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz" + integrity sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA== dependencies: - "ansi-regex" "^5.0.0" + nopt "~1.0.10" -"strip-bom@^2.0.0": - "integrity" "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=" - "resolved" "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz" - "version" "2.0.0" +tough-cookie@~2.4.3: + 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== dependencies: - "is-utf8" "^0.2.0" - -"strip-eof@^1.0.0": - "integrity" "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=" - "resolved" "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz" - "version" "1.0.0" - -"strip-indent@^1.0.1": - "integrity" "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=" - "resolved" "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz" - "version" "1.0.1" - dependencies: - "get-stdin" "^4.0.1" - -"strip-json-comments@~2.0.1": - "integrity" "sha1-PFMZQukIwml8DsNEhYwobHygpgo=" - "resolved" "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz" - "version" "2.0.1" - -"style-inject@^0.3.0": - "integrity" "sha512-IezA2qp+vcdlhJaVm5SOdPPTUu0FCEqfNSli2vRuSIBbu5Nq5UvygTk/VzeCqfLz2Atj3dVII5QBKGZRZ0edzw==" - "resolved" "https://registry.npmjs.org/style-inject/-/style-inject-0.3.0.tgz" - "version" "0.3.0" - -"stylehacks@^4.0.0": - "integrity" "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==" - "resolved" "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz" - "version" "4.0.3" - dependencies: - "browserslist" "^4.0.0" - "postcss" "^7.0.0" - "postcss-selector-parser" "^3.0.0" - -"superagent@^3.8.2": - "integrity" "sha512-GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA==" - "resolved" "https://registry.npmjs.org/superagent/-/superagent-3.8.3.tgz" - "version" "3.8.3" - dependencies: - "component-emitter" "^1.2.0" - "cookiejar" "^2.1.0" - "debug" "^3.1.0" - "extend" "^3.0.0" - "form-data" "^2.3.1" - "formidable" "^1.2.0" - "methods" "^1.1.1" - "mime" "^1.4.1" - "qs" "^6.5.1" - "readable-stream" "^2.3.5" - -"supports-color@^2.0.0": - "integrity" "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" - "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz" - "version" "2.0.0" - -"supports-color@^3.2.3": - "integrity" "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=" - "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz" - "version" "3.2.3" - dependencies: - "has-flag" "^1.0.0" - -"supports-color@^5.3.0": - "integrity" "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==" - "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz" - "version" "5.5.0" - dependencies: - "has-flag" "^3.0.0" - -"supports-color@^5.4.0": - "integrity" "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==" - "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz" - "version" "5.5.0" - dependencies: - "has-flag" "^3.0.0" - -"supports-color@^6.1.0": - "integrity" "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==" - "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz" - "version" "6.1.0" - dependencies: - "has-flag" "^3.0.0" - -"supports-color@^7.1.0": - "integrity" "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==" - "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz" - "version" "7.1.0" - dependencies: - "has-flag" "^4.0.0" - -"supports-color@5.4.0": - "integrity" "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==" - "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz" - "version" "5.4.0" - dependencies: - "has-flag" "^3.0.0" - -"svg-sprite@^1.5.0": - "integrity" "sha512-0mE5BLY3K8wg3+HrYfzpiKbIM44IGcg8uINED8ri22EdQbLvGecOHjRtkrNAlphbiU5kyGyqoBlIaukL45fs2Q==" - "resolved" "https://registry.npmjs.org/svg-sprite/-/svg-sprite-1.5.0.tgz" - "version" "1.5.0" - dependencies: - "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" - -"svgo@^1.0.0": - "integrity" "sha512-xBfxJxfk4UeVN8asec9jNxHiv3UAMv/ujwBWGYvQhhMb2u3YTGKkiybPcLFDLq7GLLWE9wa73e0/m8L5nTzQbw==" - "resolved" "https://registry.npmjs.org/svgo/-/svgo-1.2.0.tgz" - "version" "1.2.0" - dependencies: - "chalk" "^2.4.1" - "coa" "^2.0.2" - "css-select" "^2.0.0" - "css-select-base-adapter" "^0.1.1" - "css-tree" "1.0.0-alpha.28" - "css-url-regex" "^1.1.0" - "csso" "^3.5.1" - "js-yaml" "^3.12.0" - "mkdirp" "~0.5.1" - "object.values" "^1.1.0" - "sax" "~1.2.4" - "stable" "^0.1.8" - "unquote" "~1.1.1" - "util.promisify" "~1.0.0" - -"svgo@^1.1.1": - "integrity" "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==" - "resolved" "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz" - "version" "1.3.2" - dependencies: - "chalk" "^2.4.1" - "coa" "^2.0.2" - "css-select" "^2.0.0" - "css-select-base-adapter" "^0.1.1" - "css-tree" "1.0.0-alpha.37" - "csso" "^4.0.2" - "js-yaml" "^3.13.1" - "mkdirp" "~0.5.1" - "object.values" "^1.1.0" - "sax" "~1.2.4" - "stable" "^0.1.8" - "unquote" "~1.1.1" - "util.promisify" "~1.0.0" - -"tar-stream@^2.1.0": - "integrity" "sha512-+DAn4Nb4+gz6WZigRzKEZl1QuJVOLtAwwF+WUxy1fJ6X63CaGaUAxJRD2KEn1OMfcbCjySTYpNC6WmfQoIEOdw==" - "resolved" "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.0.tgz" - "version" "2.1.0" - dependencies: - "bl" "^3.0.0" - "end-of-stream" "^1.4.1" - "fs-constants" "^1.0.0" - "inherits" "^2.0.3" - "readable-stream" "^3.1.1" - -"tar-stream@^2.1.2": - "integrity" "sha512-Z9yri56Dih8IaK8gncVPx4Wqt86NDmQTSh49XLZgjWpGZL9GK9HKParS2scqHCC4w6X9Gh2jwaU45V47XTKwVA==" - "resolved" "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.3.tgz" - "version" "2.1.3" - dependencies: - "bl" "^4.0.1" - "end-of-stream" "^1.4.1" - "fs-constants" "^1.0.0" - "inherits" "^2.0.3" - "readable-stream" "^3.1.1" - -"tar@^2.0.0": - "integrity" "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==" - "resolved" "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz" - "version" "2.2.2" - dependencies: - "block-stream" "*" - "fstream" "^1.0.12" - "inherits" "2" - -"tar@^6.1.0": - "integrity" "sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==" - "resolved" "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz" - "version" "6.1.0" - dependencies: - "chownr" "^2.0.0" - "fs-minipass" "^2.0.0" - "minipass" "^3.0.0" - "minizlib" "^2.1.1" - "mkdirp" "^1.0.3" - "yallist" "^4.0.0" - -"temp-dir@^1.0.0": - "integrity" "sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=" - "resolved" "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz" - "version" "1.0.0" - -"temp-dir@^2.0.0": - "integrity" "sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==" - "resolved" "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz" - "version" "2.0.0" - -"tempfile@^2.0.0": - "integrity" "sha1-awRGhWqbERTRhW/8vlCczLCXcmU=" - "resolved" "https://registry.npmjs.org/tempfile/-/tempfile-2.0.0.tgz" - "version" "2.0.0" - dependencies: - "temp-dir" "^1.0.0" - "uuid" "^3.0.1" - -"term-size@^2.1.0": - "integrity" "sha512-a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw==" - "resolved" "https://registry.npmjs.org/term-size/-/term-size-2.2.0.tgz" - "version" "2.2.0" - -"terser@^3.14.1": - "integrity" "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==" - "resolved" "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz" - "version" "3.17.0" - dependencies: - "commander" "^2.19.0" - "source-map" "~0.6.1" - "source-map-support" "~0.5.10" - -"text-hex@1.0.x": - "integrity" "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==" - "resolved" "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz" - "version" "1.0.0" - -"then-fs@^2.0.0": - "integrity" "sha1-cveS3Z0xcFqRrhnr/Piz+WjIHaI=" - "resolved" "https://registry.npmjs.org/then-fs/-/then-fs-2.0.0.tgz" - "version" "2.0.0" - dependencies: - "promise" ">=3.2 <8" - -"throttleit@^1.0.0": - "integrity" "sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw=" - "resolved" "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz" - "version" "1.0.0" - -"through@^2.3.4", "through@^2.3.6": - "integrity" "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" - "resolved" "https://registry.npmjs.org/through/-/through-2.3.8.tgz" - "version" "2.3.8" - -"through2@^2.0.3": - "integrity" "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==" - "resolved" "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz" - "version" "2.0.5" - dependencies: - "readable-stream" "~2.3.6" - "xtend" "~4.0.1" - -"timsort@^0.3.0": - "integrity" "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=" - "resolved" "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz" - "version" "0.3.0" - -"tmp@^0.0.33": - "integrity" "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==" - "resolved" "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz" - "version" "0.0.33" - dependencies: - "os-tmpdir" "~1.0.2" - -"tmp@^0.1.0": - "integrity" "sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==" - "resolved" "https://registry.npmjs.org/tmp/-/tmp-0.1.0.tgz" - "version" "0.1.0" - dependencies: - "rimraf" "^2.6.3" - -"tmp@^0.2.1", "tmp@0.2.1": - "integrity" "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==" - "resolved" "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz" - "version" "0.2.1" - dependencies: - "rimraf" "^3.0.0" - -"tmp@0.0.33": - "integrity" "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==" - "resolved" "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz" - "version" "0.0.33" - dependencies: - "os-tmpdir" "~1.0.2" - -"to-array@0.1.4": - "integrity" "sha1-F+bBH3PdTz10zaek/zI46a2b+JA=" - "resolved" "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz" - "version" "0.1.4" - -"to-object-path@^0.3.0": - "integrity" "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=" - "resolved" "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz" - "version" "0.3.0" - dependencies: - "kind-of" "^3.0.2" - -"to-readable-stream@^1.0.0": - "integrity" "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==" - "resolved" "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz" - "version" "1.0.0" - -"to-regex-range@^2.1.0": - "integrity" "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=" - "resolved" "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz" - "version" "2.1.1" - dependencies: - "is-number" "^3.0.0" - "repeat-string" "^1.6.1" - -"to-regex-range@^5.0.1": - "integrity" "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==" - "resolved" "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz" - "version" "5.0.1" - dependencies: - "is-number" "^7.0.0" - -"to-regex@^3.0.1", "to-regex@^3.0.2": - "integrity" "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==" - "resolved" "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz" - "version" "3.0.2" - dependencies: - "define-property" "^2.0.2" - "extend-shallow" "^3.0.2" - "regex-not" "^1.0.2" - "safe-regex" "^1.1.0" - -"toidentifier@1.0.0": - "integrity" "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==" - "resolved" "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz" - "version" "1.0.0" + psl "^1.1.24" + punycode "^1.4.1" -"toml@^3.0.0": - "integrity" "sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w==" - "resolved" "https://registry.npmjs.org/toml/-/toml-3.0.0.tgz" - "version" "3.0.0" - -"touch@^3.1.0": - "integrity" "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==" - "resolved" "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz" - "version" "3.1.0" - dependencies: - "nopt" "~1.0.10" - -"tough-cookie@~2.4.3": - "integrity" "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==" - "resolved" "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz" - "version" "2.4.3" +tough-cookie@~2.5.0: + version "2.5.0" + resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz" + integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== dependencies: - "psl" "^1.1.24" - "punycode" "^1.4.1" + psl "^1.1.28" + punycode "^2.1.1" -"tough-cookie@~2.5.0": - "integrity" "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==" - "resolved" "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz" - "version" "2.5.0" - dependencies: - "psl" "^1.1.28" - "punycode" "^2.1.1" +tree-kill@^1.2.2: + version "1.2.2" + resolved "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz" + integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A== -"tree-kill@^1.2.2": - "integrity" "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==" - "resolved" "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz" - "version" "1.2.2" - -"trim-newlines@^1.0.0": - "integrity" "sha1-WIeWa7WCpFA6QetST301ARgVphM=" - "resolved" "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz" - "version" "1.0.0" +trim-newlines@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz" + integrity sha1-WIeWa7WCpFA6QetST301ARgVphM= "true-case-path@^1.0.2": version "1.0.3" From 821e7513fff3f9386782c0492aae24e24c91d94e Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 27 May 2021 15:59:03 +0530 Subject: [PATCH 025/306] fix: tune button missing & sidebar drop-icon fix --- frappe/desk/doctype/workspace/workspace.py | 2 +- frappe/public/js/frappe/views/wiki.js | 7 +++ frappe/public/js/frappe/wiki_blocks/card.js | 53 ++++++++++++------- frappe/public/js/frappe/wiki_blocks/chart.js | 53 ++++++++++++------- frappe/public/js/frappe/wiki_blocks/header.js | 4 ++ .../public/js/frappe/wiki_blocks/shortcut.js | 53 ++++++++++++------- 6 files changed, 111 insertions(+), 61 deletions(-) diff --git a/frappe/desk/doctype/workspace/workspace.py b/frappe/desk/doctype/workspace/workspace.py index d9bf5fa618..52007b00cd 100644 --- a/frappe/desk/doctype/workspace/workspace.py +++ b/frappe/desk/doctype/workspace/workspace.py @@ -116,7 +116,7 @@ class Workspace(Document): "icon": card.get('icon'), "hidden": card.get('hidden') or False, "link_count": card.get('link_count'), - "idx": self.links[-1].idx + 1 + "idx": 1 if not self.links else self.links[-1].idx + 1 }) for link in links: diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index a0635f5494..83f80e8769 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -233,6 +233,12 @@ frappe.views.Wiki = class Wiki { if (this.sidebar_items && this.sidebar_items[this.current_page_name]) { this.sidebar_items[this.current_page_name][0].firstElementChild.classList.remove("selected"); this.sidebar_items[page][0].firstElementChild.classList.add("selected"); + if (this.sidebar_items[page].parents('.sidebar-item-container')[0]) { + this.sidebar_items[page] + .parents('.sidebar-item-container') + .find('.drop-icon use') + .attr("href", "#icon-small-up"); + } } this.current_page_name = page; localStorage.current_wiki_page = page; @@ -475,6 +481,7 @@ frappe.views.Wiki = class Wiki { } $sidebar_item.appendTo($child_section); $child_section.removeClass('hidden'); + $item_container.find('.drop-icon use').attr("href", "#icon-small-up"); } } diff --git a/frappe/public/js/frappe/wiki_blocks/card.js b/frappe/public/js/frappe/wiki_blocks/card.js index 820056a6ab..ecde804be2 100644 --- a/frappe/public/js/frappe/wiki_blocks/card.js +++ b/frappe/public/js/frappe/wiki_blocks/card.js @@ -42,31 +42,35 @@ export default class Card { } if (!this.readOnly) { - let $widget_control = $(this.wrapper).find('.widget-control'); - this.add_custom_button( - frappe.utils.icon('dot-horizontal', 'xs'), - (event) => { - let evn = event; - !$('.ce-settings.ce-settings--opened').length && - setTimeout(() => { - this.api.toolbar.toggleBlockSettings(); - var position = $(evn.target).offset(); - $('.ce-settings.ce-settings--opened').offset({ - top: position.top + 25, - left: position.left - 77 - }); - }, 50); - }, - "tune-btn", - `${__('Tune')}`, - null, - $widget_control - ); + this._add_tune_button(); } return this.wrapper; } + _add_tune_button() { + let $widget_control = $(this.wrapper).find('.widget-control'); + this.add_custom_button( + frappe.utils.icon('dot-horizontal', 'xs'), + (event) => { + let evn = event; + !$('.ce-settings.ce-settings--opened').length && + setTimeout(() => { + this.api.toolbar.toggleBlockSettings(); + var position = $(evn.target).offset(); + $('.ce-settings.ce-settings--opened').offset({ + top: position.top + 25, + left: position.left - 77 + }); + }, 50); + }, + "tune-btn", + `${__('Tune')}`, + null, + $widget_control + ); + } + add_custom_button(html, action, class_name = "", title="", btn_type, wrapper) { if (!btn_type) btn_type = 'btn-secondary'; let button = $( @@ -79,6 +83,14 @@ export default class Card { wrapper.prepend(button); } + validate(savedData) { + if (!savedData.card_name) { + return false; + } + + return true; + } + save(blockContent) { return { card_name: blockContent.getAttribute('card_name'), @@ -120,6 +132,7 @@ export default class Card { this.card_widget.customize(this.options); this.wrapper.setAttribute("card_name", this.card_widget.label); this.new_card_widget = this.card_widget.get_config(); + this._add_tune_button(); }, }); diff --git a/frappe/public/js/frappe/wiki_blocks/chart.js b/frappe/public/js/frappe/wiki_blocks/chart.js index c7f92222c0..c562b453ed 100644 --- a/frappe/public/js/frappe/wiki_blocks/chart.js +++ b/frappe/public/js/frappe/wiki_blocks/chart.js @@ -42,31 +42,35 @@ export default class Chart { } if (!this.readOnly) { - let $widget_control = $(this.wrapper).find('.widget-control'); - this.add_custom_button( - frappe.utils.icon('dot-horizontal', 'xs'), - (event) => { - let evn = event; - !$('.ce-settings.ce-settings--opened').length && - setTimeout(() => { - this.api.toolbar.toggleBlockSettings(); - var position = $(evn.target).offset(); - $('.ce-settings.ce-settings--opened').offset({ - top: position.top + 25, - left: position.left - 77 - }); - }, 50); - }, - "tune-btn", - `${__('Tune')}`, - null, - $widget_control - ); + this._add_tune_button(); } return this.wrapper; } + _add_tune_button() { + let $widget_control = $(this.wrapper).find('.widget-control'); + this.add_custom_button( + frappe.utils.icon('dot-horizontal', 'xs'), + (event) => { + let evn = event; + !$('.ce-settings.ce-settings--opened').length && + setTimeout(() => { + this.api.toolbar.toggleBlockSettings(); + var position = $(evn.target).offset(); + $('.ce-settings.ce-settings--opened').offset({ + top: position.top + 25, + left: position.left - 77 + }); + }, 50); + }, + "tune-btn", + `${__('Tune')}`, + null, + $widget_control + ); + } + add_custom_button(html, action, class_name = "", title="", btn_type, wrapper) { if (!btn_type) btn_type = 'btn-secondary'; let button = $( @@ -79,6 +83,14 @@ export default class Chart { wrapper.prepend(button); } + validate(savedData) { + if (!savedData.chart_name) { + return false; + } + + return true; + } + save(blockContent) { return { chart_name: blockContent.getAttribute('chart_name'), @@ -120,6 +132,7 @@ export default class Chart { this.chart_widget.customize(this.options); this.wrapper.setAttribute("chart_name", this.chart_widget.label); this.new_chart_widget = this.chart_widget.get_config(); + this._add_tune_button(); }, }); diff --git a/frappe/public/js/frappe/wiki_blocks/header.js b/frappe/public/js/frappe/wiki_blocks/header.js index 727f495a42..a3fcc39175 100644 --- a/frappe/public/js/frappe/wiki_blocks/header.js +++ b/frappe/public/js/frappe/wiki_blocks/header.js @@ -296,6 +296,10 @@ export default class Header { tag.classList.add(this._CSS.wrapper); + if (!this.readOnly) { + tag.contentEditable = true; + } + tag.dataset.placeholder = this.api.i18n.t(this._settings.placeholder || ''); return tag; diff --git a/frappe/public/js/frappe/wiki_blocks/shortcut.js b/frappe/public/js/frappe/wiki_blocks/shortcut.js index c6d01a8800..dc1cbb5b5a 100644 --- a/frappe/public/js/frappe/wiki_blocks/shortcut.js +++ b/frappe/public/js/frappe/wiki_blocks/shortcut.js @@ -41,30 +41,34 @@ export default class Shortcut { } if (!this.readOnly) { - let $widget_control = $(this.wrapper).find('.widget-control'); - this.add_custom_button( - frappe.utils.icon('dot-horizontal', 'xs'), - (event) => { - let evn = event; - !$('.ce-settings.ce-settings--opened').length && - setTimeout(() => { - this.api.toolbar.toggleBlockSettings(); - var position = $(evn.target).offset(); - $('.ce-settings.ce-settings--opened').offset({ - top: position.top + 25, - left: position.left - 77 - }); - }, 50); - }, - "tune-btn", - `${__('Tune')}`, - null, - $widget_control - ); + this._add_tune_button(); } return this.wrapper; } + _add_tune_button() { + let $widget_control = $(this.wrapper).find('.widget-control'); + this.add_custom_button( + frappe.utils.icon('dot-horizontal', 'xs'), + (event) => { + let evn = event; + !$('.ce-settings.ce-settings--opened').length && + setTimeout(() => { + this.api.toolbar.toggleBlockSettings(); + var position = $(evn.target).offset(); + $('.ce-settings.ce-settings--opened').offset({ + top: position.top + 25, + left: position.left - 77 + }); + }, 50); + }, + "tune-btn", + `${__('Tune')}`, + null, + $widget_control + ); + } + add_custom_button(html, action, class_name = "", title="", btn_type, wrapper) { if (!btn_type) btn_type = 'btn-secondary'; let button = $( @@ -77,6 +81,14 @@ export default class Shortcut { wrapper.prepend(button); } + validate(savedData) { + if (!savedData.shortcut_name) { + return false; + } + + return true; + } + save(blockContent) { return { shortcut_name: blockContent.getAttribute('shortcut_name'), @@ -118,6 +130,7 @@ export default class Shortcut { this.shortcut_widget.customize(this.options); this.wrapper.setAttribute("shortcut_name", this.shortcut_widget.label); this.new_shortcut_widget = this.shortcut_widget.get_config(); + this._add_tune_button(); }, }); From 6bdcae1201de560971dc882c901ad18eb7f71f26 Mon Sep 17 00:00:00 2001 From: Kenneth Sequeira Date: Fri, 28 May 2021 21:19:21 +0530 Subject: [PATCH 026/306] feat: add number format parameter in doc.get_formatted --- frappe/model/base_document.py | 4 ++-- frappe/utils/formatters.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py index 54d77ba988..1ac07f5fb7 100644 --- a/frappe/model/base_document.py +++ b/frappe/model/base_document.py @@ -862,7 +862,7 @@ class BaseDocument(object): return self._precision[cache_key][fieldname] - def get_formatted(self, fieldname, doc=None, currency=None, absolute_value=False, translated=False): + def get_formatted(self, fieldname, doc=None, currency=None, absolute_value=False, translated=False, format=None): from frappe.utils.formatters import format_value df = self.meta.get_field(fieldname) @@ -886,7 +886,7 @@ class BaseDocument(object): if (absolute_value or doc.get('absolute_value')) and isinstance(val, (int, float)): val = abs(self.get(fieldname)) - return format_value(val, df=df, doc=doc, currency=currency) + return format_value(val, df=df, doc=doc, currency=currency, format=format) def is_print_hide(self, fieldname, df=None, for_print=True): """Returns true if fieldname is to be hidden for print. diff --git a/frappe/utils/formatters.py b/frappe/utils/formatters.py index 7913413878..c0c7e4bca0 100644 --- a/frappe/utils/formatters.py +++ b/frappe/utils/formatters.py @@ -9,7 +9,7 @@ from frappe.model.meta import get_field_currency, get_field_precision import re from six import string_types -def format_value(value, df=None, doc=None, currency=None, translated=False): +def format_value(value, df=None, doc=None, currency=None, translated=False, format=None): '''Format value based on given fieldtype, document reference, currency reference. If docfield info (df) is not given, it will try and guess based on the datatype of the value''' if isinstance(df, string_types): @@ -58,7 +58,7 @@ def format_value(value, df=None, doc=None, currency=None, translated=False): elif df.get("fieldtype") == "Currency": default_currency = frappe.db.get_default("currency") currency = currency or get_field_currency(df, doc) or default_currency - return fmt_money(value, precision=get_field_precision(df, doc), currency=currency) + return fmt_money(value, precision=get_field_precision(df, doc), currency=currency, format=format) elif df.get("fieldtype") == "Float": precision = get_field_precision(df, doc) From 799397abae5c594c47e9e7d8085156f8bb845a58 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Mon, 31 May 2021 10:23:22 +0530 Subject: [PATCH 027/306] refactor: Refactor code --- .../internal_wiki_page/internal_wiki_page.py | 11 +- frappe/public/js/frappe/utils/utils.js | 13 ++ frappe/public/js/frappe/views/wiki.js | 189 ++++++++--------- .../public/js/frappe/widgets/base_widget.js | 43 ++-- frappe/public/js/frappe/wiki_blocks/block.js | 150 +++++++++++++ frappe/public/js/frappe/wiki_blocks/card.js | 196 ++--------------- frappe/public/js/frappe/wiki_blocks/chart.js | 197 ++---------------- frappe/public/js/frappe/wiki_blocks/header.js | 96 ++------- .../public/js/frappe/wiki_blocks/paragraph.js | 98 ++------- .../public/js/frappe/wiki_blocks/shortcut.js | 196 ++--------------- frappe/public/js/frappe/wiki_blocks/spacer.js | 105 ++-------- 11 files changed, 355 insertions(+), 939 deletions(-) create mode 100644 frappe/public/js/frappe/wiki_blocks/block.js diff --git a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py index 6be92f835d..5d119e364d 100644 --- a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py +++ b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py @@ -52,13 +52,4 @@ def save_wiki_page(title, parent, sb_items, deleted_pages, new_widgets, blocks, if json.loads(new_widgets): save_new_widget(title, new_widgets) - return doc.title - -@frappe.whitelist() -def get_page_content(page): - return frappe.db.get_value("Internal Wiki Page", page, "content") - -@frappe.whitelist() -def get_pages(): - return frappe.db.get_list('Internal Wiki Page', fields=['name', 'icon', 'private', 'parent_page', 'sequence_id'], - order_by="sequence_id asc") \ No newline at end of file + return doc.title \ No newline at end of file diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js index 484d9c65f1..9e20e419be 100644 --- a/frappe/public/js/frappe/utils/utils.js +++ b/frappe/public/js/frappe/utils/utils.js @@ -1319,5 +1319,18 @@ Object.assign(frappe.utils, { let e = clipboard_paste_event; let clipboard_data = e.clipboardData || window.clipboardData || e.originalEvent.clipboardData; return clipboard_data.getData('Text'); + }, + + add_custom_button(html, action, class_name = "", title="", btn_type, wrapper, prepend) { + if (!btn_type) btn_type = 'btn-secondary'; + let button = $( + `` + ); + button.click(event => { + event.stopPropagation(); + action && action(event); + }); + !prepend && button.appendTo(wrapper); + prepend && wrapper.prepend(button); } }); diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index 83f80e8769..f247f34330 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -57,7 +57,8 @@ frappe.views.Wiki = class Wiki { } setup_wiki_pages() { - this.get_pages().then(() => { + this.get_pages().then(pages => { + this.all_pages = pages; if (this.all_pages) { frappe.wiki_pages = {}; let root_pages = this.all_pages.filter(page => page.parent_page == '' || page.parent_page == null); @@ -75,11 +76,29 @@ frappe.views.Wiki = class Wiki { } get_pages() { - return frappe.xcall("frappe.desk.doctype.internal_wiki_page.internal_wiki_page.get_pages").then(data => { - this.all_pages = data; + return frappe.db.get_list('Internal Wiki Page', { + fields: ['name', 'icon', 'private', 'parent_page', 'sequence_id'], + order_by: "sequence_id asc" }); } + sidebar_item_container(item) { + return $(` +
+
+ + ${frappe.utils.icon(item.icon || "folder-normal", "md")} + ${item.label || item.name} + +
+
+
+ `); + } + make_sidebar(items) { if (this.sidebar.find('.standard-sidebar-section')[0]) { this.sidebar.find('.standard-sidebar-section')[0].remove(); @@ -136,60 +155,19 @@ frappe.views.Wiki = class Wiki { } } - sidebar_item_container(item) { - return $(` -
-
- - ${frappe.utils.icon(item.icon || "folder-normal", "md")} - ${item.label || item.name} - -
-
-
- `); - } - show() { if (!this.all_pages) { // pages not yet loaded, call again after a bit setTimeout(() => { this.show(); - }, 500); + }, 100); return; } + let page = this.get_page_to_show(); this.page.set_title(`${__(page)}`); - this.show_page(page); - this.get_content(page).then(() => { - this.get_data(page).then(() => { - if (this.content) { - if (this.editor) { - this.editor.isReady.then(() => { - this.editor.configuration.tools.chart.config.page_data = this.page_data; - this.editor.configuration.tools.shortcut.config.page_data = this.page_data; - this.editor.configuration.tools.card.config.page_data = this.page_data; - this.editor.render({ - blocks: JSON.parse(this.content) || [] - }); - }); - } else { - this.initialize_editorjs(JSON.parse(this.content)); - } - } - }); - }); - } - get_content(page) { - return frappe.xcall("frappe.desk.doctype.internal_wiki_page.internal_wiki_page.get_page_content", { - page: page - }).then(data => { - this.content = data; - }); + this.show_page(page); } get_data(page) { @@ -233,6 +211,7 @@ frappe.views.Wiki = class Wiki { if (this.sidebar_items && this.sidebar_items[this.current_page_name]) { this.sidebar_items[this.current_page_name][0].firstElementChild.classList.remove("selected"); this.sidebar_items[page][0].firstElementChild.classList.add("selected"); + if (this.sidebar_items[page].parents('.sidebar-item-container')[0]) { this.sidebar_items[page] .parents('.sidebar-item-container') @@ -240,6 +219,7 @@ frappe.views.Wiki = class Wiki { .attr("href", "#icon-small-up"); } } + this.current_page_name = page; localStorage.current_wiki_page = page; @@ -252,6 +232,28 @@ frappe.views.Wiki = class Wiki { } this.setup_actions(); + this.prepare_editorjs(page); + } + + prepare_editorjs(page) { + frappe.db.get_value("Internal Wiki Page", page, "content") + .then(content => { + this.content = JSON.parse(content.message["content"]); + this.get_data(page).then(() => { + if (this.editor) { + this.editor.isReady.then(() => { + this.editor.configuration.tools.chart.config.page_data = this.page_data; + this.editor.configuration.tools.shortcut.config.page_data = this.page_data; + this.editor.configuration.tools.card.config.page_data = this.page_data; + this.editor.render({ + blocks: this.content || [] + }); + }); + } else { + this.initialize_editorjs(this.content); + } + }); + }); } setup_actions() { @@ -280,16 +282,49 @@ frappe.views.Wiki = class Wiki { initialize_editorjs_undo() { this.undo = new Undo({ editor: this.editor }); - this.undo.initialize({blocks: JSON.parse(this.content)}); + this.undo.initialize({blocks: this.content}); this.undo.readOnly = false; } + setup_customization_buttons() { + this.page.clear_primary_action(); + this.page.clear_secondary_action(); + this.page.clear_inner_toolbar(); + + this.page.set_primary_action( + __("Save Customizations"), + () => { + this.page.clear_primary_action(); + this.page.clear_secondary_action(); + this.undo.readOnly = true; + this.save_page(); + this.editor.readOnly.toggle(); + this.isReadOnly = true; + }, + null, + __("Saving") + ); + + this.page.set_secondary_action( + __("Discard"), + () => { + this.page.clear_primary_action(); + this.page.clear_secondary_action(); + this.editor.readOnly.toggle(); + this.isReadOnly = true; + this.deleted_sidebar_items = []; + this.reload(); + frappe.show_alert({ message: __("Customizations Discarded"), indicator: "info" }); + } + ); + } + show_sidebar_actions() { this.sidebar.find('.standard-sidebar-section').addClass('show-control'); } add_sidebar_actions(item, sidebar_control) { - this.add_custom_button( + frappe.utils.add_custom_button( frappe.utils.icon('drag', 'xs'), null, "drag-handle", @@ -297,7 +332,7 @@ frappe.views.Wiki = class Wiki { null, sidebar_control ); - this.add_custom_button( + frappe.utils.add_custom_button( frappe.utils.icon('delete', 'xs'), () => this.delete_page(item.name), "delete-page", @@ -307,18 +342,6 @@ frappe.views.Wiki = class Wiki { ); } - add_custom_button(html, action, class_name = "", title="", btn_type, wrapper) { - if (!btn_type) btn_type = 'btn-secondary'; - let button = $( - `` - ); - button.click(event => { - event.stopPropagation(); - action && action(); - }); - button.appendTo(wrapper); - } - delete_page(name) { if (!this.deleted_sidebar_items.includes(name)) { this.deleted_sidebar_items.push(name); @@ -370,39 +393,6 @@ frappe.views.Wiki = class Wiki { }); } - setup_customization_buttons() { - this.page.clear_primary_action(); - this.page.clear_secondary_action(); - this.page.clear_inner_toolbar(); - - this.page.set_primary_action( - __("Save Customizations"), - () => { - this.page.clear_primary_action(); - this.page.clear_secondary_action(); - this.undo.readOnly = true; - this.save_page(); - this.editor.readOnly.toggle(); - this.isReadOnly = true; - }, - null, - __("Saving") - ); - - this.page.set_secondary_action( - __("Discard"), - () => { - this.page.clear_primary_action(); - this.page.clear_secondary_action(); - this.editor.readOnly.toggle(); - this.isReadOnly = true; - this.deleted_sidebar_items = []; - this.reload(); - frappe.show_alert({ message: __("Customizations Discarded"), indicator: "info" }); - } - ); - } - initialize_new_page() { const d = new frappe.ui.Dialog({ title: __('Set Title'), @@ -459,7 +449,7 @@ frappe.views.Wiki = class Wiki { }; let $sidebar_item = this.sidebar_item_container(item); - this.add_custom_button( + frappe.utils.add_custom_button( frappe.utils.icon('drag', 'xs'), null, "drag-handle", @@ -486,13 +476,12 @@ frappe.views.Wiki = class Wiki { } initialize_editorjs(blocks) { - const data = { - blocks: blocks || [] - }; this.editor = new EditorJS({ + data: { + blocks: blocks || [] + }, tools: this.tools, autofocus: false, - data, tunes: ['spacingTune'], readOnly: true, logLevel: 'ERROR' diff --git a/frappe/public/js/frappe/widgets/base_widget.js b/frappe/public/js/frappe/widgets/base_widget.js index 821df609ef..90a2c1e641 100644 --- a/frappe/public/js/frappe/widgets/base_widget.js +++ b/frappe/public/js/frappe/widgets/base_widget.js @@ -25,18 +25,23 @@ export default class Widget { this.action_area.empty(); options.allow_sorting && - this.add_custom_button( + frappe.utils.add_custom_button( frappe.utils.icon('drag', 'xs'), null, "drag-handle", + `${__('Drag')}`, + null, + this.action_area ); options.allow_delete && - this.add_custom_button( + frappe.utils.add_custom_button( frappe.utils.icon('delete', 'xs'), () => this.delete(), "", - `${__('Delete')}` + `${__('Delete')}`, + null, + this.action_area ); if (options.allow_hiding) { @@ -48,11 +53,13 @@ export default class Widget { } const classname = this.hidden ? 'fa fa-eye' : 'fa fa-eye-slash'; const title = this.hidden ? `${__('Show')}` : `${__('Hide')}`; - this.add_custom_button( + frappe.utils.add_custom_button( ``, () => this.hide_or_show(), "show-or-hide-button", - title + title, + null, + this.action_area ); this.show_or_hide_button = this.action_area.find( @@ -61,18 +68,24 @@ export default class Widget { } options.allow_edit && - this.add_custom_button( + frappe.utils.add_custom_button( frappe.utils.icon("edit", "xs"), - () => this.edit() + () => this.edit(), + null, + `${__('Edit')}`, + null, + this.action_area ); if (options.allow_resize) { const title = this.width == 'Full'? `${__('Collapse')}` : `${__('Expand')}`; - this.add_custom_button( + frappe.utils.add_custom_button( '', () => this.toggle_width(), "resize-button", - title + title, + null, + this.action_area ); this.resize_button = this.action_area.find( @@ -129,18 +142,6 @@ export default class Widget { this.subtitle && this.subtitle_field.html(this.subtitle); } - add_custom_button(html, action, class_name = "", title="", btn_type) { - if (!btn_type) btn_type = 'btn-secondary'; - let button = $( - `` - ); - button.click(event => { - event.stopPropagation(); - action && action(); - }); - button.appendTo(this.action_area); - } - delete(animate=true) { let remove_widget = (setup_new) => { this.widget.remove(); diff --git a/frappe/public/js/frappe/wiki_blocks/block.js b/frappe/public/js/frappe/wiki_blocks/block.js new file mode 100644 index 0000000000..1f8cdf1f21 --- /dev/null +++ b/frappe/public/js/frappe/wiki_blocks/block.js @@ -0,0 +1,150 @@ +import get_dialog_constructor from "../widgets/widget_dialog.js"; + +export default class Block { + constructor(opts) { + Object.assign(this, opts); + } + + make(block, block_name, widget_type = block) { + let block_data = this.config.page_data[block+'s'].items.find(obj => { + return obj.label == block_name; + }); + if (!block_data) return; + this.wrapper.innerHTML = ''; + block_data.in_customize_mode = !this.readOnly; + this.block_widget = new frappe.widget.SingleWidgetGroup({ + container: this.wrapper, + type: widget_type, + class_name: block == 'chart' ? 'widget-charts' : '', + options: this.options, + widgets: block_data, + api: this.api, + block: this.block + }); + this.wrapper.setAttribute(block+'_name', block_name); + if (!this.readOnly) { + this.block_widget.customize(); + } + } + + rendered() { + var e = this.wrapper.closest('.ce-block'); + e.classList.add("col-" + this.col); + e.classList.add("pt-" + this.pt); + e.classList.add("pr-" + this.pr); + e.classList.add("pb-" + this.pb); + e.classList.add("pl-" + this.pl); + } + + new(block, widget_type = block) { + const dialog_class = get_dialog_constructor(widget_type); + let block_name = block+'_name'; + this.dialog = new dialog_class({ + label: this.label, + type: widget_type, + primary_action: (widget) => { + widget.in_customize_mode = 1; + this.block_widget = frappe.widget.make_widget({ + ...widget, + widget_type: widget_type, + container: this.wrapper, + options: { + ...this.options, + on_delete: () => this.api.blocks.delete(), + on_edit: () => this.on_edit(this.block_widget) + } + }); + this.block_widget.customize(this.options); + this.wrapper.setAttribute(block_name, this.block_widget.label); + this.new_block_widget = this.block_widget.get_config(); + this.add_tune_button(); + }, + }); + + if (!this.readOnly && this.data && !this.data[block_name]) { + this.dialog.make(); + } + } + + on_edit(block_obj) { + let block_name = block_obj.edit_dialog.type+'_name'; + if (block_obj.edit_dialog.type == 'links') { + block_name = 'card_name'; + } + let block = block_obj.get_config(); + this.block_widget.widgets = block; + this.wrapper.setAttribute(block_name, block.label); + this.new_block_widget = block_obj.get_config(); + } + + add_tune_button() { + let $widget_control = $(this.wrapper).find('.widget-control'); + frappe.utils.add_custom_button( + frappe.utils.icon('dot-horizontal', 'xs'), + (event) => { + let evn = event; + !$('.ce-settings.ce-settings--opened').length && + setTimeout(() => { + this.api.toolbar.toggleBlockSettings(); + var position = $(evn.target).offset(); + $('.ce-settings.ce-settings--opened').offset({ + top: position.top + 25, + left: position.left - 77 + }); + }, 50); + }, + "tune-btn", + `${__('Tune')}`, + null, + $widget_control, + true + ); + } + + get_col() { + let col = 12; + let class_name = "col-12"; + let wrapper = this.wrapper.closest('.ce-block'); + const col_class = new RegExp(/\bcol-.+?\b/, "g"); + if (wrapper.className.match(col_class)) { + wrapper.classList.forEach(function (cn) { + cn.match(col_class) && (class_name = cn); + }); + let parts = class_name.split("-"); + col = parseInt(parts[1]); + } + return col; + } + + get_padding() { + let direction = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; + let padding = 0; + let pad_name = "p" + direction + "-0"; + let wrapper = this.wrapper.closest('.ce-block'); + let pad_left = new RegExp(/\pl-.+?\b/, "g"); + let pad_right = new RegExp(/\pr-.+?\b/, "g"); + let pad_top = new RegExp(/\pt-.+?\b/, "g"); + let pad_bottom = new RegExp(/\pb-.+?\b/, "g"); + + const get_padding = (pad_direction) => { + if (wrapper.className.match(pad_direction)) { + wrapper.classList.forEach(function (cn) { + cn.match(pad_direction) && (pad_name = cn); + }); + let parts = pad_name.split("-"); + padding = parseInt(parts[1]); + } + } + + if ("l" == direction) { + get_padding(pad_left); + } else if ("r" == direction) { + get_padding(pad_right); + } else if ("t" == direction) { + get_padding(pad_top); + } else if ("b" == direction) { + get_padding(pad_bottom); + } + return padding; + } +} \ No newline at end of file diff --git a/frappe/public/js/frappe/wiki_blocks/card.js b/frappe/public/js/frappe/wiki_blocks/card.js index ecde804be2..ed3704cc2d 100644 --- a/frappe/public/js/frappe/wiki_blocks/card.js +++ b/frappe/public/js/frappe/wiki_blocks/card.js @@ -1,5 +1,5 @@ -import get_dialog_constructor from "../widgets/widget_dialog.js"; -export default class Card { +import Block from "./block.js"; +export default class Card extends Block { static get toolbox() { return { title: 'Card', @@ -11,12 +11,8 @@ export default class Card { return true; } - constructor({data, api, config, readOnly, block}) { - this.data = data; - this.api = api; - this.block = block; - this.config = config; - this.readOnly = readOnly; + constructor(opts = {data, api, config, readOnly, block}) { + super(opts) this.sections = {}; this.col = this.data.col ? this.data.col : "12"; this.pt = this.data.pt ? this.data.pt : "0"; @@ -35,54 +31,19 @@ export default class Card { render() { this.wrapper = document.createElement('div'); - this._new_card(); + this.new('card', 'links'); if (this.data && this.data.card_name) { - this._make_cards(this.data.card_name); + this.make('card', this.data.card_name, 'links'); } if (!this.readOnly) { - this._add_tune_button(); + this.add_tune_button(); } return this.wrapper; } - _add_tune_button() { - let $widget_control = $(this.wrapper).find('.widget-control'); - this.add_custom_button( - frappe.utils.icon('dot-horizontal', 'xs'), - (event) => { - let evn = event; - !$('.ce-settings.ce-settings--opened').length && - setTimeout(() => { - this.api.toolbar.toggleBlockSettings(); - var position = $(evn.target).offset(); - $('.ce-settings.ce-settings--opened').offset({ - top: position.top + 25, - left: position.left - 77 - }); - }, 50); - }, - "tune-btn", - `${__('Tune')}`, - null, - $widget_control - ); - } - - add_custom_button(html, action, class_name = "", title="", btn_type, wrapper) { - if (!btn_type) btn_type = 'btn-secondary'; - let button = $( - `` - ); - button.click(event => { - event.stopPropagation(); - action && action(event); - }); - wrapper.prepend(button); - } - validate(savedData) { if (!savedData.card_name) { return false; @@ -94,143 +55,12 @@ export default class Card { save(blockContent) { return { card_name: blockContent.getAttribute('card_name'), - col: this._getCol(), - pt: this._getPadding("t"), - pr: this._getPadding("r"), - pb: this._getPadding("b"), - pl: this._getPadding("l"), - new: this.new_card_widget + col: this.get_col(), + pt: this.get_padding("t"), + pr: this.get_padding("r"), + pb: this.get_padding("b"), + pl: this.get_padding("l"), + new: this.new_block_widget }; } - - rendered() { - var e = this.wrapper.closest('.ce-block'); - e.classList.add("col-" + this.col); - e.classList.add("pt-" + this.pt); - e.classList.add("pr-" + this.pr); - e.classList.add("pb-" + this.pb); - e.classList.add("pl-" + this.pl); - } - - _new_card() { - const dialog_class = get_dialog_constructor('links'); - this.dialog = new dialog_class({ - label: this.label, - type: 'card', - primary_action: (widget) => { - widget.in_customize_mode = 1; - this.card_widget = frappe.widget.make_widget({ - ...widget, - widget_type: 'links', - container: this.wrapper, - options: { - ...this.options, - on_delete: () => this.api.blocks.delete(), - on_edit: () => this.on_edit(this.card_widget) - } - }); - this.card_widget.customize(this.options); - this.wrapper.setAttribute("card_name", this.card_widget.label); - this.new_card_widget = this.card_widget.get_config(); - this._add_tune_button(); - }, - }); - - if (!this.readOnly && this.data && !this.data.card_name) { - this.dialog.make(); - } - } - - _getCol() { - var e = 12; - var t = "col-12"; - var n = this.wrapper.closest('.ce-block'); - var r = new RegExp(/\bcol-.+?\b/, "g"); - if (n.className.match(r)) { - n.classList.forEach(function (e) { - e.match(r) && (t = e); - }); - var a = t.split("-"); - e = parseInt(a[1]); - } - return e; - } - - _getPadding() { - var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; - var t = 0; - var n = "p" + e + "-0"; - var r = this.wrapper.closest('.ce-block'); - var a = new RegExp(/\pl-.+?\b/, "g"); - var i = new RegExp(/\pr-.+?\b/, "g"); - var o = new RegExp(/\pt-.+?\b/, "g"); - var c = new RegExp(/\pb-.+?\b/, "g"); - if ("l" == e) { - if (r.className.match(a)) { - r.classList.forEach(function (e) { - e.match(a) && (n = e); - }); - var s = n.split("-"); - t = parseInt(s[1]); - } - } else if ("r" == e) { - if (r.className.match(i)) { - r.classList.forEach(function (e) { - e.match(i) && (n = e); - }); - var l = n.split("-"); - t = parseInt(l[1]); - } - } else if ("t" == e) { - if (r.className.match(o)) { - r.classList.forEach(function (e) { - e.match(o) && (n = e); - }); - var u = n.split("-"); - t = parseInt(u[1]); - } - } else if ("b" == e && r.className.match(c)) { - r.classList.forEach(function (e) { - e.match(c) && (n = e); - }); - var p = n.split("-"); - t = parseInt(p[1]); - } - return t; - } - - _make_fieldgroup(parent, ddf_list) { - this.card_field = new frappe.ui.FieldGroup({ - "fields": ddf_list, - "parent": parent - }); - this.card_field.make(); - } - - on_edit(card_obj) { - let card = card_obj.get_config(); - this.card_widget.widgets = card; - this.wrapper.setAttribute("card_name", card.label); - this.new_card_widget = card_obj.get_config(); - } - - _make_cards(card_name) { - let card = this.config.page_data.cards.items.find(obj => { - return obj.label == card_name; - }); - this.wrapper.innerHTML = ''; - card.in_customize_mode = !this.readOnly; - this.card_widget = new frappe.widget.SingleWidgetGroup({ - container: this.wrapper, - type: "links", - options: this.options, - widgets: card, - api: this.api, - block: this.block - }); - this.wrapper.setAttribute("card_name", card_name); - if (!this.readOnly) { - this.card_widget.customize(); - } - } } \ No newline at end of file diff --git a/frappe/public/js/frappe/wiki_blocks/chart.js b/frappe/public/js/frappe/wiki_blocks/chart.js index c562b453ed..cf43cc5455 100644 --- a/frappe/public/js/frappe/wiki_blocks/chart.js +++ b/frappe/public/js/frappe/wiki_blocks/chart.js @@ -1,5 +1,5 @@ -import get_dialog_constructor from "../widgets/widget_dialog.js"; -export default class Chart { +import Block from "./block.js"; +export default class Chart extends Block { static get toolbox() { return { title: 'Chart', @@ -11,12 +11,8 @@ export default class Chart { return true; } - constructor({data, api, config, readOnly, block}) { - this.data = data; - this.api = api; - this.block = block; - this.config = config; - this.readOnly = readOnly; + constructor(opts = {data, api, config, readOnly, block}) { + super(opts) this.col = this.data.col ? this.data.col : "12"; this.pt = this.data.pt ? this.data.pt : "0"; this.pr = this.data.pr ? this.data.pr : "0"; @@ -35,54 +31,19 @@ export default class Chart { render() { this.wrapper = document.createElement('div'); - this._new_chart(); + this.new('chart'); if (this.data && this.data.chart_name) { - this._make_charts(this.data.chart_name); + this.make('chart', this.data.chart_name); } if (!this.readOnly) { - this._add_tune_button(); + this.add_tune_button(); } return this.wrapper; } - _add_tune_button() { - let $widget_control = $(this.wrapper).find('.widget-control'); - this.add_custom_button( - frappe.utils.icon('dot-horizontal', 'xs'), - (event) => { - let evn = event; - !$('.ce-settings.ce-settings--opened').length && - setTimeout(() => { - this.api.toolbar.toggleBlockSettings(); - var position = $(evn.target).offset(); - $('.ce-settings.ce-settings--opened').offset({ - top: position.top + 25, - left: position.left - 77 - }); - }, 50); - }, - "tune-btn", - `${__('Tune')}`, - null, - $widget_control - ); - } - - add_custom_button(html, action, class_name = "", title="", btn_type, wrapper) { - if (!btn_type) btn_type = 'btn-secondary'; - let button = $( - `` - ); - button.click(event => { - event.stopPropagation(); - action && action(event); - }); - wrapper.prepend(button); - } - validate(savedData) { if (!savedData.chart_name) { return false; @@ -94,144 +55,12 @@ export default class Chart { save(blockContent) { return { chart_name: blockContent.getAttribute('chart_name'), - col: this._getCol(), - pt: this._getPadding("t"), - pr: this._getPadding("r"), - pb: this._getPadding("b"), - pl: this._getPadding("l"), - new: this.new_chart_widget + col: this.get_col(), + pt: this.get_padding("t"), + pr: this.get_padding("r"), + pb: this.get_padding("b"), + pl: this.get_padding("l"), + new: this.new_block_widget }; } - - rendered() { - var e = this.wrapper.closest('.ce-block'); - e.classList.add("col-" + this.col); - e.classList.add("pt-" + this.pt); - e.classList.add("pr-" + this.pr); - e.classList.add("pb-" + this.pb); - e.classList.add("pl-" + this.pl); - } - - _new_chart() { - const dialog_class = get_dialog_constructor('chart'); - this.dialog = new dialog_class({ - label: this.label, - type: 'chart', - primary_action: (widget) => { - widget.in_customize_mode = 1; - this.chart_widget = frappe.widget.make_widget({ - ...widget, - widget_type: 'chart', - container: this.wrapper, - options: { - ...this.options, - on_delete: () => this.api.blocks.delete(), - on_edit: () => this.on_edit(this.chart_widget) - } - }); - this.chart_widget.customize(this.options); - this.wrapper.setAttribute("chart_name", this.chart_widget.label); - this.new_chart_widget = this.chart_widget.get_config(); - this._add_tune_button(); - }, - }); - - if (!this.readOnly && this.data && !this.data.chart_name) { - this.dialog.make(); - } - } - - _getCol() { - var e = 12; - var t = "col-12"; - var n = this.wrapper.closest('.ce-block'); - var r = new RegExp(/\bcol-.+?\b/, "g"); - if (n.className.match(r)) { - n.classList.forEach(function (e) { - e.match(r) && (t = e); - }); - var a = t.split("-"); - e = parseInt(a[1]); - } - return e; - } - - _getPadding() { - var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; - var t = 0; - var n = "p" + e + "-0"; - var r = this.wrapper.closest('.ce-block'); - var a = new RegExp(/\pl-.+?\b/, "g"); - var i = new RegExp(/\pr-.+?\b/, "g"); - var o = new RegExp(/\pt-.+?\b/, "g"); - var c = new RegExp(/\pb-.+?\b/, "g"); - if ("l" == e) { - if (r.className.match(a)) { - r.classList.forEach(function (e) { - e.match(a) && (n = e); - }); - var s = n.split("-"); - t = parseInt(s[1]); - } - } else if ("r" == e) { - if (r.className.match(i)) { - r.classList.forEach(function (e) { - e.match(i) && (n = e); - }); - var l = n.split("-"); - t = parseInt(l[1]); - } - } else if ("t" == e) { - if (r.className.match(o)) { - r.classList.forEach(function (e) { - e.match(o) && (n = e); - }); - var u = n.split("-"); - t = parseInt(u[1]); - } - } else if ("b" == e && r.className.match(c)) { - r.classList.forEach(function (e) { - e.match(c) && (n = e); - }); - var p = n.split("-"); - t = parseInt(p[1]); - } - return t; - } - - _make_fieldgroup(parent, ddf_list) { - this.chart_field = new frappe.ui.FieldGroup({ - "fields": ddf_list, - "parent": parent - }); - this.chart_field.make(); - } - - on_edit(chart_obj) { - let chart = chart_obj.get_config(); - this.chart_widget.widgets = chart; - this.wrapper.setAttribute("chart_name", chart.label); - this.new_chart_widget = chart_obj.get_config(); - } - - _make_charts(chart_name) { - let chart = this.config.page_data.charts.items.find(obj => { - return obj.label == chart_name; - }); - if (!chart) return; - this.wrapper.innerHTML = ''; - this.chart_widget = new frappe.widget.SingleWidgetGroup({ - container: this.wrapper, - type: "chart", - class_name: "widget-charts", - options: this.options, - widgets: chart, - api: this.api, - block: this.block - }); - this.wrapper.setAttribute("chart_name", chart_name); - if (!this.readOnly) { - this.chart_widget.customize(); - } - } } \ No newline at end of file diff --git a/frappe/public/js/frappe/wiki_blocks/header.js b/frappe/public/js/frappe/wiki_blocks/header.js index a3fcc39175..eeb6054e63 100644 --- a/frappe/public/js/frappe/wiki_blocks/header.js +++ b/frappe/public/js/frappe/wiki_blocks/header.js @@ -1,8 +1,9 @@ -export default class Header { +import Block from "./block.js"; +export default class Header extends Block { constructor({ data, config, api, readOnly }) { - this.api = api; - this.readOnly = readOnly; + let opts = { config, api, readOnly }; + super(opts); this._CSS = { block: this.api.styles.block, @@ -11,7 +12,7 @@ export default class Header { wrapper: 'ce-header', }; - this._settings = config; + this._settings = this.config; this._data = this.normalizeData(data); this.settingsButtons = []; this._element = this.getTag(); @@ -55,7 +56,7 @@ export default class Header { this.wrapper.classList.add('widget', 'header'); - this.add_custom_button( + frappe.utils.add_custom_button( frappe.utils.icon('dot-horizontal', 'xs'), (event) => { let evn = event; @@ -75,7 +76,7 @@ export default class Header { $widget_control ); - this.add_custom_button( + frappe.utils.add_custom_button( frappe.utils.icon('drag', 'xs'), null, "drag-handle", @@ -84,7 +85,7 @@ export default class Header { $widget_control ); - this.add_custom_button( + frappe.utils.add_custom_button( frappe.utils.icon('delete', 'xs'), () => this.api.blocks.delete(), "delete-header", @@ -98,18 +99,6 @@ export default class Header { return this._element; } - add_custom_button(html, action, class_name = "", title="", btn_type, wrapper) { - if (!btn_type) btn_type = 'btn-secondary'; - let button = $( - `` - ); - button.click(event => { - event.stopPropagation(); - action && action(event); - }); - button.appendTo(wrapper); - } - renderSettings() { const holder = document.createElement('DIV'); @@ -167,14 +156,15 @@ export default class Header { } save(toolsContent) { + this.wrapper = this._element; return { text: toolsContent.innerText, level: this.currentLevel.number, - col: this._getCol(), - pt: this._getPadding("t"), - pr: this._getPadding("r"), - pb: this._getPadding("b"), - pl: this._getPadding("l") + col: this.get_col(), + pt: this.get_padding("t"), + pr: this.get_padding("r"), + pb: this.get_padding("b"), + pl: this.get_padding("l") }; } @@ -187,64 +177,6 @@ export default class Header { e.classList.add("pl-" + this.pl); } - _getCol() { - var e = 12; - var t = "col-12"; - var n = this._element.closest('.ce-block'); - var r = new RegExp(/\bcol-.+?\b/, "g"); - if (n.className.match(r)) { - n.classList.forEach(function (e) { - e.match(r) && (t = e); - }); - var a = t.split("-"); - e = parseInt(a[1]); - } - return e; - } - - _getPadding() { - var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; - var t = 0; - var n = "p" + e + "-0"; - var r = this._element.closest('.ce-block'); - var a = new RegExp(/\pl-.+?\b/, "g"); - var i = new RegExp(/\pr-.+?\b/, "g"); - var o = new RegExp(/\pt-.+?\b/, "g"); - var c = new RegExp(/\pb-.+?\b/, "g"); - if ("l" == e) { - if (r.className.match(a)) { - r.classList.forEach(function (e) { - e.match(a) && (n = e); - }); - var s = n.split("-"); - t = parseInt(s[1]); - } - } else if ("r" == e) { - if (r.className.match(i)) { - r.classList.forEach(function (e) { - e.match(i) && (n = e); - }); - var l = n.split("-"); - t = parseInt(l[1]); - } - } else if ("t" == e) { - if (r.className.match(o)) { - r.classList.forEach(function (e) { - e.match(o) && (n = e); - }); - var u = n.split("-"); - t = parseInt(u[1]); - } - } else if ("b" == e && r.className.match(c)) { - r.classList.forEach(function (e) { - e.match(c) && (n = e); - }); - var p = n.split("-"); - t = parseInt(p[1]); - } - return t; - } - static get conversionConfig() { return { export: 'text', // use 'text' property for other blocks diff --git a/frappe/public/js/frappe/wiki_blocks/paragraph.js b/frappe/public/js/frappe/wiki_blocks/paragraph.js index cc05f3edbc..3a5f411954 100644 --- a/frappe/public/js/frappe/wiki_blocks/paragraph.js +++ b/frappe/public/js/frappe/wiki_blocks/paragraph.js @@ -1,12 +1,13 @@ -export default class Paragraph { +import Block from "./block.js"; +export default class Paragraph extends Block{ static get DEFAULT_PLACEHOLDER() { return ''; } constructor({data, config, api, readOnly}) { - this.api = api; - this.readOnly = readOnly; + let opts = {config, api, readOnly}; + super(opts); this._CSS = { block: this.api.styles.block, @@ -17,10 +18,10 @@ export default class Paragraph { this.onKeyUp = this.onKeyUp.bind(this); } - this._placeholder = config.placeholder ? config.placeholder : Paragraph.DEFAULT_PLACEHOLDER; + this._placeholder = this.config.placeholder ? this.config.placeholder : Paragraph.DEFAULT_PLACEHOLDER; this._data = {}; this._element = this.drawView(); - this._preserveBlank = config.preserveBlank !== undefined ? config.preserveBlank : false; + this._preserveBlank = this.config.preserveBlank !== undefined ? this.config.preserveBlank : false; this.data = data; this.col = this.data.col ? this.data.col : "12"; @@ -68,7 +69,7 @@ export default class Paragraph { this.wrapper.classList.add('widget'); - this.add_custom_button( + frappe.utils.add_custom_button( frappe.utils.icon('dot-horizontal', 'xs'), (event) => { let evn = event; @@ -88,7 +89,7 @@ export default class Paragraph { $para_control ); - this.add_custom_button( + frappe.utils.add_custom_button( frappe.utils.icon('drag', 'xs'), null, "drag-handle", @@ -97,7 +98,7 @@ export default class Paragraph { $para_control ); - this.add_custom_button( + frappe.utils.add_custom_button( frappe.utils.icon('delete', 'xs'), () => this.api.blocks.delete(), "delete-paragraph", @@ -111,18 +112,6 @@ export default class Paragraph { return this._element; } - add_custom_button(html, action, class_name = "", title="", btn_type, wrapper) { - if (!btn_type) btn_type = 'btn-secondary'; - let button = $( - `` - ); - button.click(event => { - event.stopPropagation(); - action && action(event); - }); - button.appendTo(wrapper); - } - merge(data) { let newData = { text: this.data.text + data.text @@ -140,13 +129,14 @@ export default class Paragraph { } save(toolsContent) { + this.wrapper = this._element; return { text: toolsContent.innerText, - col: this._getCol(), - pt: this._getPadding("t"), - pr: this._getPadding("r"), - pb: this._getPadding("b"), - pl: this._getPadding("l") + col: this.get_col(), + pt: this.get_padding("t"), + pr: this.get_padding("r"), + pb: this.get_padding("b"), + pl: this.get_padding("l") }; } @@ -159,64 +149,6 @@ export default class Paragraph { e.classList.add("pl-" + this.pl); } - _getCol() { - var e = 12; - var t = "col-12"; - var n = this._element.closest('.ce-block'); - var r = new RegExp(/\bcol-.+?\b/, "g"); - if (n.className.match(r)) { - n.classList.forEach(function (e) { - e.match(r) && (t = e); - }); - var a = t.split("-"); - e = parseInt(a[1]); - } - return e; - } - - _getPadding() { - var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; - var t = 0; - var n = "p" + e + "-0"; - var r = this._element.closest('.ce-block'); - var a = new RegExp(/\pl-.+?\b/, "g"); - var i = new RegExp(/\pr-.+?\b/, "g"); - var o = new RegExp(/\pt-.+?\b/, "g"); - var c = new RegExp(/\pb-.+?\b/, "g"); - if ("l" == e) { - if (r.className.match(a)) { - r.classList.forEach(function (e) { - e.match(a) && (n = e); - }); - var s = n.split("-"); - t = parseInt(s[1]); - } - } else if ("r" == e) { - if (r.className.match(i)) { - r.classList.forEach(function (e) { - e.match(i) && (n = e); - }); - var l = n.split("-"); - t = parseInt(l[1]); - } - } else if ("t" == e) { - if (r.className.match(o)) { - r.classList.forEach(function (e) { - e.match(o) && (n = e); - }); - var u = n.split("-"); - t = parseInt(u[1]); - } - } else if ("b" == e && r.className.match(c)) { - r.classList.forEach(function (e) { - e.match(c) && (n = e); - }); - var p = n.split("-"); - t = parseInt(p[1]); - } - return t; - } - onPaste(event) { const data = { text: event.detail.data.innerHTML diff --git a/frappe/public/js/frappe/wiki_blocks/shortcut.js b/frappe/public/js/frappe/wiki_blocks/shortcut.js index dc1cbb5b5a..d7b4a9b4f1 100644 --- a/frappe/public/js/frappe/wiki_blocks/shortcut.js +++ b/frappe/public/js/frappe/wiki_blocks/shortcut.js @@ -1,5 +1,5 @@ -import get_dialog_constructor from "../widgets/widget_dialog.js"; -export default class Shortcut { +import Block from "./block.js"; +export default class Shortcut extends Block { static get toolbox() { return { title: 'Shortcut', @@ -11,12 +11,8 @@ export default class Shortcut { return true; } - constructor({data, api, config, readOnly, block}) { - this.data = data; - this.api = api; - this.block = block; - this.config = config; - this.readOnly = readOnly; + constructor(opts = {data, api, config, readOnly, block}) { + super(opts); this.col = this.data.col ? this.data.col : "12"; this.pt = this.data.pt ? this.data.pt : "0"; this.pr = this.data.pr ? this.data.pr : "0"; @@ -34,53 +30,18 @@ export default class Shortcut { render() { this.wrapper = document.createElement('div'); - this._new_shortcut(); + this.new('shortcut'); if (this.data && this.data.shortcut_name) { - this._make_shortcuts(this.data.shortcut_name); + this.make('shortcut', this.data.shortcut_name); } if (!this.readOnly) { - this._add_tune_button(); + this.add_tune_button(); } return this.wrapper; } - _add_tune_button() { - let $widget_control = $(this.wrapper).find('.widget-control'); - this.add_custom_button( - frappe.utils.icon('dot-horizontal', 'xs'), - (event) => { - let evn = event; - !$('.ce-settings.ce-settings--opened').length && - setTimeout(() => { - this.api.toolbar.toggleBlockSettings(); - var position = $(evn.target).offset(); - $('.ce-settings.ce-settings--opened').offset({ - top: position.top + 25, - left: position.left - 77 - }); - }, 50); - }, - "tune-btn", - `${__('Tune')}`, - null, - $widget_control - ); - } - - add_custom_button(html, action, class_name = "", title="", btn_type, wrapper) { - if (!btn_type) btn_type = 'btn-secondary'; - let button = $( - `` - ); - button.click(event => { - event.stopPropagation(); - action && action(event); - }); - wrapper.prepend(button); - } - validate(savedData) { if (!savedData.shortcut_name) { return false; @@ -92,143 +53,12 @@ export default class Shortcut { save(blockContent) { return { shortcut_name: blockContent.getAttribute('shortcut_name'), - col: this._getCol(), - pt: this._getPadding("t"), - pr: this._getPadding("r"), - pb: this._getPadding("b"), - pl: this._getPadding("l"), - new: this.new_shortcut_widget + col: this.get_col(), + pt: this.get_padding("t"), + pr: this.get_padding("r"), + pb: this.get_padding("b"), + pl: this.get_padding("l"), + new: this.new_block_widget }; } - - rendered() { - var e = this.wrapper.closest('.ce-block'); - e.classList.add("col-" + this.col); - e.classList.add("pt-" + this.pt); - e.classList.add("pr-" + this.pr); - e.classList.add("pb-" + this.pb); - e.classList.add("pl-" + this.pl); - } - - _new_shortcut() { - const dialog_class = get_dialog_constructor('shortcut'); - this.dialog = new dialog_class({ - label: this.label, - type: 'shortcut', - primary_action: (widget) => { - widget.in_customize_mode = 1; - this.shortcut_widget = frappe.widget.make_widget({ - ...widget, - widget_type: 'shortcut', - container: this.wrapper, - options: { - ...this.options, - on_delete: () => this.api.blocks.delete(), - on_edit: () => this.on_edit(this.shortcut_widget) - } - }); - this.shortcut_widget.customize(this.options); - this.wrapper.setAttribute("shortcut_name", this.shortcut_widget.label); - this.new_shortcut_widget = this.shortcut_widget.get_config(); - this._add_tune_button(); - }, - }); - - if (!this.readOnly && this.data && !this.data.shortcut_name) { - this.dialog.make(); - } - } - - _getCol() { - var e = 12; - var t = "col-12"; - var n = this.wrapper.closest('.ce-block'); - var r = new RegExp(/\bcol-.+?\b/, "g"); - if (n.className.match(r)) { - n.classList.forEach(function (e) { - e.match(r) && (t = e); - }); - var a = t.split("-"); - e = parseInt(a[1]); - } - return e; - } - - _getPadding() { - var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; - var t = 0; - var n = "p" + e + "-0"; - var r = this.wrapper.closest('.ce-block'); - var a = new RegExp(/\pl-.+?\b/, "g"); - var i = new RegExp(/\pr-.+?\b/, "g"); - var o = new RegExp(/\pt-.+?\b/, "g"); - var c = new RegExp(/\pb-.+?\b/, "g"); - if ("l" == e) { - if (r.className.match(a)) { - r.classList.forEach(function (e) { - e.match(a) && (n = e); - }); - var s = n.split("-"); - t = parseInt(s[1]); - } - } else if ("r" == e) { - if (r.className.match(i)) { - r.classList.forEach(function (e) { - e.match(i) && (n = e); - }); - var l = n.split("-"); - t = parseInt(l[1]); - } - } else if ("t" == e) { - if (r.className.match(o)) { - r.classList.forEach(function (e) { - e.match(o) && (n = e); - }); - var u = n.split("-"); - t = parseInt(u[1]); - } - } else if ("b" == e && r.className.match(c)) { - r.classList.forEach(function (e) { - e.match(c) && (n = e); - }); - var p = n.split("-"); - t = parseInt(p[1]); - } - return t; - } - - _make_fieldgroup(parent, ddf_list) { - this.shortcut_field = new frappe.ui.FieldGroup({ - "fields": ddf_list, - "parent": parent - }); - this.shortcut_field.make(); - } - - on_edit(shortcut_obj) { - let shortcut = shortcut_obj.get_config(); - this.shortcut_widget.widgets = shortcut; - this.wrapper.setAttribute("shortcut_name", shortcut.label); - this.new_shortcut_widget = shortcut_obj.get_config(); - } - - _make_shortcuts(shortcut_name) { - let shortcut = this.config.page_data.shortcuts.items.find(obj => { - return obj.label == shortcut_name; - }); - this.wrapper.innerHTML = ''; - shortcut.in_customize_mode = !this.readOnly; - this.shortcut_widget = new frappe.widget.SingleWidgetGroup({ - container: this.wrapper, - type: "shortcut", - options: this.options, - widgets: shortcut, - api: this.api, - block: this.block - }); - this.wrapper.setAttribute("shortcut_name", shortcut_name); - if (!this.readOnly) { - this.shortcut_widget.customize(); - } - } } \ No newline at end of file diff --git a/frappe/public/js/frappe/wiki_blocks/spacer.js b/frappe/public/js/frappe/wiki_blocks/spacer.js index 5f26f06ca4..d2b7707ced 100644 --- a/frappe/public/js/frappe/wiki_blocks/spacer.js +++ b/frappe/public/js/frappe/wiki_blocks/spacer.js @@ -1,4 +1,5 @@ -export default class Spacer { +import Block from './block.js'; +export default class Spacer extends Block { static get toolbox() { return { title: 'Spacer', @@ -10,11 +11,8 @@ export default class Spacer { return true; } - constructor({data, api, config, readOnly}) { - this.data = data; - this.api = api; - this.config = config; - this.readOnly = readOnly; + constructor(opts = {data, api, config, readOnly}) { + super(opts); this.col = this.data.col ? this.data.col : "12"; this.pt = this.data.pt ? this.data.pt : "0"; this.pr = this.data.pr ? this.data.pr : "0"; @@ -39,7 +37,7 @@ export default class Spacer { let $widget_control = $spacer.find('.widget-control'); - this.add_custom_button( + frappe.utils.add_custom_button( frappe.utils.icon('dot-horizontal', 'xs'), (event) => { let evn = event; @@ -59,7 +57,7 @@ export default class Spacer { $widget_control ); - this.add_custom_button( + frappe.utils.add_custom_button( frappe.utils.icon('drag', 'xs'), null, "drag-handle", @@ -68,7 +66,7 @@ export default class Spacer { $widget_control ); - this.add_custom_button( + frappe.utils.add_custom_button( frappe.utils.icon('delete', 'xs'), () => this.api.blocks.delete(), "delete-spacer", @@ -80,92 +78,13 @@ export default class Spacer { return this.wrapper; } - add_custom_button(html, action, class_name = "", title="", btn_type, wrapper) { - if (!btn_type) btn_type = 'btn-secondary'; - let button = $( - `` - ); - button.click(event => { - event.stopPropagation(); - action && action(event); - }); - button.appendTo(wrapper); - } - save() { return { - col: this._getCol(), - pt: this._getPadding("t"), - pr: this._getPadding("r"), - pb: this._getPadding("b"), - pl: this._getPadding("l") + col: this.get_col(), + pt: this.get_padding("t"), + pr: this.get_padding("r"), + pb: this.get_padding("b"), + pl: this.get_padding("l") }; } - - rendered() { - var e = this.wrapper.closest('.ce-block'); - e.classList.add("col-" + this.col); - e.classList.add("pt-" + this.pt); - e.classList.add("pr-" + this.pr); - e.classList.add("pb-" + this.pb); - e.classList.add("pl-" + this.pl); - } - - _getCol() { - var e = 12; - var t = "col-12"; - var n = this.wrapper.closest('.ce-block'); - var r = new RegExp(/\bcol-.+?\b/, "g"); - if (n.className.match(r)) { - n.classList.forEach(function (e) { - e.match(r) && (t = e); - }); - var a = t.split("-"); - e = parseInt(a[1]); - } - return e; - } - - _getPadding() { - var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; - var t = 0; - var n = "p" + e + "-0"; - var r = this.wrapper.closest('.ce-block'); - var a = new RegExp(/\pl-.+?\b/, "g"); - var i = new RegExp(/\pr-.+?\b/, "g"); - var o = new RegExp(/\pt-.+?\b/, "g"); - var c = new RegExp(/\pb-.+?\b/, "g"); - if ("l" == e) { - if (r.className.match(a)) { - r.classList.forEach(function (e) { - e.match(a) && (n = e); - }); - var s = n.split("-"); - t = parseInt(s[1]); - } - } else if ("r" == e) { - if (r.className.match(i)) { - r.classList.forEach(function (e) { - e.match(i) && (n = e); - }); - var l = n.split("-"); - t = parseInt(l[1]); - } - } else if ("t" == e) { - if (r.className.match(o)) { - r.classList.forEach(function (e) { - e.match(o) && (n = e); - }); - var u = n.split("-"); - t = parseInt(u[1]); - } - } else if ("b" == e && r.className.match(c)) { - r.classList.forEach(function (e) { - e.match(c) && (n = e); - }); - var p = n.split("-"); - t = parseInt(p[1]); - } - return t; - } } \ No newline at end of file From 2cc90ceafe725f177f22f223d40c437c164b715c Mon Sep 17 00:00:00 2001 From: shariquerik Date: Mon, 31 May 2021 11:13:51 +0530 Subject: [PATCH 028/306] fix: sider fix --- frappe/public/js/frappe/views/wiki.js | 9 +++++---- frappe/public/js/frappe/wiki_blocks/block.js | 2 +- frappe/public/js/frappe/wiki_blocks/card.js | 4 ++-- frappe/public/js/frappe/wiki_blocks/chart.js | 4 ++-- frappe/public/js/frappe/wiki_blocks/paragraph.js | 2 +- frappe/public/js/frappe/wiki_blocks/shortcut.js | 4 ++-- frappe/public/js/frappe/wiki_blocks/spacer.js | 4 ++-- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index f247f34330..06964a9d38 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -140,8 +140,8 @@ frappe.views.Wiki = class Wiki { this.add_drop_icon(item, sidebar_control, $item_container); } - add_drop_icon(item, sidebar_control, $item_container) { - let $child_item_section = $item_container.find('.sidebar-child-item'); + add_drop_icon(item, sidebar_control, item_container) { + let $child_item_section = item_container.find('.sidebar-child-item'); let $drop_icon = $(``) .appendTo(sidebar_control); @@ -400,7 +400,8 @@ frappe.views.Wiki = class Wiki { { label: __('Title'), fieldtype: 'Data', - fieldname: 'title' + fieldname: 'title', + "reqd": 1 }, { label: __('Parent'), @@ -422,7 +423,7 @@ frappe.views.Wiki = class Wiki { type: "header", data: { text: this.title, - level: 2 + level: 4 } } ] diff --git a/frappe/public/js/frappe/wiki_blocks/block.js b/frappe/public/js/frappe/wiki_blocks/block.js index 1f8cdf1f21..a3f95890c7 100644 --- a/frappe/public/js/frappe/wiki_blocks/block.js +++ b/frappe/public/js/frappe/wiki_blocks/block.js @@ -134,7 +134,7 @@ export default class Block { let parts = pad_name.split("-"); padding = parseInt(parts[1]); } - } + }; if ("l" == direction) { get_padding(pad_left); diff --git a/frappe/public/js/frappe/wiki_blocks/card.js b/frappe/public/js/frappe/wiki_blocks/card.js index ed3704cc2d..0c8dc4ca82 100644 --- a/frappe/public/js/frappe/wiki_blocks/card.js +++ b/frappe/public/js/frappe/wiki_blocks/card.js @@ -11,8 +11,8 @@ export default class Card extends Block { return true; } - constructor(opts = {data, api, config, readOnly, block}) { - super(opts) + constructor({data, api, config, readOnly, block}) { + super(arguments[0]); this.sections = {}; this.col = this.data.col ? this.data.col : "12"; this.pt = this.data.pt ? this.data.pt : "0"; diff --git a/frappe/public/js/frappe/wiki_blocks/chart.js b/frappe/public/js/frappe/wiki_blocks/chart.js index cf43cc5455..505d03c732 100644 --- a/frappe/public/js/frappe/wiki_blocks/chart.js +++ b/frappe/public/js/frappe/wiki_blocks/chart.js @@ -11,8 +11,8 @@ export default class Chart extends Block { return true; } - constructor(opts = {data, api, config, readOnly, block}) { - super(opts) + constructor({data, api, config, readOnly, block}) { + super(arguments[0]); this.col = this.data.col ? this.data.col : "12"; this.pt = this.data.pt ? this.data.pt : "0"; this.pr = this.data.pr ? this.data.pr : "0"; diff --git a/frappe/public/js/frappe/wiki_blocks/paragraph.js b/frappe/public/js/frappe/wiki_blocks/paragraph.js index 3a5f411954..ebabcc98b6 100644 --- a/frappe/public/js/frappe/wiki_blocks/paragraph.js +++ b/frappe/public/js/frappe/wiki_blocks/paragraph.js @@ -1,5 +1,5 @@ import Block from "./block.js"; -export default class Paragraph extends Block{ +export default class Paragraph extends Block { static get DEFAULT_PLACEHOLDER() { return ''; diff --git a/frappe/public/js/frappe/wiki_blocks/shortcut.js b/frappe/public/js/frappe/wiki_blocks/shortcut.js index d7b4a9b4f1..7de8097715 100644 --- a/frappe/public/js/frappe/wiki_blocks/shortcut.js +++ b/frappe/public/js/frappe/wiki_blocks/shortcut.js @@ -11,8 +11,8 @@ export default class Shortcut extends Block { return true; } - constructor(opts = {data, api, config, readOnly, block}) { - super(opts); + constructor({data, api, config, readOnly, block}) { + super(arguments[0]); this.col = this.data.col ? this.data.col : "12"; this.pt = this.data.pt ? this.data.pt : "0"; this.pr = this.data.pr ? this.data.pr : "0"; diff --git a/frappe/public/js/frappe/wiki_blocks/spacer.js b/frappe/public/js/frappe/wiki_blocks/spacer.js index d2b7707ced..4a97dbcb02 100644 --- a/frappe/public/js/frappe/wiki_blocks/spacer.js +++ b/frappe/public/js/frappe/wiki_blocks/spacer.js @@ -11,8 +11,8 @@ export default class Spacer extends Block { return true; } - constructor(opts = {data, api, config, readOnly}) { - super(opts); + constructor({data, api, config, readOnly}) { + super(arguments[0]); this.col = this.data.col ? this.data.col : "12"; this.pt = this.data.pt ? this.data.pt : "0"; this.pr = this.data.pr ? this.data.pr : "0"; From 35590453dfa09f72c3f2cfd74a079cbb692535a9 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Mon, 31 May 2021 19:45:14 +0530 Subject: [PATCH 029/306] fix: minor fixes --- frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py index 5d119e364d..392169b502 100644 --- a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py +++ b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py @@ -12,7 +12,7 @@ class InternalWikiPage(Document): def before_insert(self): sequence_id_list = frappe.get_all('Internal Wiki Page', {'sequence_id'}) - self.sequence_id = max([page.sequence_id for page in sequence_id_list]) + 1 + self.sequence_id = max([page.sequence_id for page in sequence_id_list] or [0]) + 1 @frappe.whitelist() def save_wiki_page(title, parent, sb_items, deleted_pages, new_widgets, blocks, save=True): From bcd6d2cb42a7e23ea274e0e3a64ff7a2f1499b4c Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 1 Jun 2021 11:25:15 +0530 Subject: [PATCH 030/306] fix: Added link count field in Workspace Link --- .../doctype/workspace_link/workspace_link.json | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/frappe/desk/doctype/workspace_link/workspace_link.json b/frappe/desk/doctype/workspace_link/workspace_link.json index 53dadad83d..a7b217be9e 100644 --- a/frappe/desk/doctype/workspace_link/workspace_link.json +++ b/frappe/desk/doctype/workspace_link/workspace_link.json @@ -8,15 +8,16 @@ "type", "label", "icon", - "only_for", "hidden", "link_details_section", "link_type", "link_to", "column_break_7", "dependencies", + "only_for", "onboard", - "is_query_report" + "is_query_report", + "link_count" ], "fields": [ { @@ -99,12 +100,19 @@ "fieldname": "is_query_report", "fieldtype": "Check", "label": "Is Query Report" + }, + { + "depends_on": "eval:doc.type == \"Card Break\"", + "fieldname": "link_count", + "fieldtype": "Int", + "hidden": 1, + "label": "Link Count" } ], "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2021-05-13 13:10:18.128512", + "modified": "2021-06-01 11:23:28.990593", "modified_by": "Administrator", "module": "Desk", "name": "Workspace Link", From 6596dd612f16225c065d3fbcbda3fad1248d0b08 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 1 Jun 2021 20:33:04 +0530 Subject: [PATCH 031/306] fix: User based Wiki Pages --- frappe/desk/desktop.py | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index ba4a44d7d7..f4d4796aef 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -543,20 +543,40 @@ def save_customization(page, config): def save_new_widget(page, new_widgets): original_page = frappe.get_doc("Workspace", page) + page_doc = get_custom_workspace_for_user(page) + + # Update field values + page_doc.update({ + "icon": original_page.icon, + "charts_label": original_page.charts_label, + "cards_label": original_page.cards_label, + "shortcuts_label": original_page.shortcuts_label, + "module": original_page.module, + "onboarding": original_page.onboarding, + "developer_mode_only": original_page.developer_mode_only, + "category": original_page.category, + "charts": original_page.charts, + "shortcuts": original_page.shortcuts, + "links": original_page.links, + }) + widgets = _dict(loads(new_widgets)) if widgets.chart: - original_page.charts.extend(new_widget(widgets.chart, "Workspace Chart", "charts")) + page_doc.charts.extend(new_widget(widgets.chart, "Workspace Chart", "charts")) if widgets.shortcut: - original_page.shortcuts.extend(new_widget(widgets.shortcut, "Workspace Shortcut", "shortcuts")) + page_doc.shortcuts.extend(new_widget(widgets.shortcut, "Workspace Shortcut", "shortcuts")) if widgets.card: - original_page.build_links_table_from_card(widgets.card) + page_doc.build_links_table_from_card(widgets.card) # remove duplicate and unwanted widgets - clean_up(original_page, page) + clean_up(page_doc, page) + + # Set label + page_doc.label = page + '-' + frappe.session.user try: - original_page.save(ignore_permissions=True) + page_doc.save(ignore_permissions=True) except (ValidationError, TypeError) as e: # Create a json string to log json_config = dumps(widgets, sort_keys=True, indent=4) From 915f778538ee2bc711bfa9c47cdeb874fa0af235 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 2 Jun 2021 15:15:54 +0530 Subject: [PATCH 032/306] fix: minor fix --- frappe/desk/desktop.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index f4d4796aef..9df46cc7df 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -555,10 +555,13 @@ def save_new_widget(page, new_widgets): "onboarding": original_page.onboarding, "developer_mode_only": original_page.developer_mode_only, "category": original_page.category, - "charts": original_page.charts, - "shortcuts": original_page.shortcuts, - "links": original_page.links, }) + if page_doc.is_new(): + page_doc.update({ + "charts": original_page.charts, + "shortcuts": original_page.shortcuts, + "links": original_page.links, + }) widgets = _dict(loads(new_widgets)) From c36f0631ee1e1bece691039b904c7ece9dc452c9 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 2 Jun 2021 16:52:00 +0530 Subject: [PATCH 033/306] fix: User based Wiki Pages fix --- frappe/desk/desktop.py | 22 ++++++++++------- frappe/desk/doctype/workspace/workspace.json | 25 +++++++++++++------- frappe/public/js/frappe/views/wiki.js | 3 ++- 3 files changed, 32 insertions(+), 18 deletions(-) diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index 9df46cc7df..8ea5738caf 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -5,6 +5,7 @@ from __future__ import unicode_literals import frappe import json +from typing import Dict, List from json import loads, dumps from frappe import _, DoesNotExistError, ValidationError, _dict from frappe.boot import get_allowed_pages, get_allowed_reports @@ -30,7 +31,9 @@ def handle_not_exist(fn): class Workspace: - def __init__(self, page_name, minimal=False): + def __init__(self, page_name, minimal=False, wiki=False) -> List[Dict]: + if isinstance(wiki, str): + wiki = json.loads(wiki) self.page_name = page_name self.extended_links = [] self.extended_charts = [] @@ -39,7 +42,7 @@ class Workspace: self.user = frappe.get_user() self.allowed_modules = self.get_cached('user_allowed_modules', self.get_allowed_modules) - self.doc = self.get_page_for_user() + self.doc = self.get_page_for_user(wiki) if self.doc.module and self.doc.module not in self.allowed_modules: raise frappe.PermissionError @@ -104,11 +107,12 @@ class Workspace: return self.user.allow_modules - def get_page_for_user(self): + def get_page_for_user(self, wiki=False): filters = { 'extends': self.page_name, 'for_user': frappe.session.user } + filters['for_wiki'] = wiki user_pages = frappe.get_all("Workspace", filters=filters, limit=1) if user_pages: return frappe.get_cached_doc("Workspace", user_pages[0]) @@ -350,7 +354,7 @@ class Workspace: @frappe.whitelist() @frappe.read_only() -def get_desktop_page(page): +def get_desktop_page(page, wiki=False): """Applies permissions, customizations and returns the configruration for a page on desk. @@ -361,7 +365,7 @@ def get_desktop_page(page): dict: dictionary of cards, charts and shortcuts to be displayed on website """ try: - wspace = Workspace(page) + wspace = Workspace(page, wiki=wiki) wspace.build_workspace() return { 'charts': wspace.charts, @@ -461,7 +465,7 @@ def get_custom_report_list(module): return out -def get_custom_workspace_for_user(page): +def get_custom_workspace_for_user(page, wiki=False): """Get custom page from workspace if exists or create one Args: @@ -474,12 +478,14 @@ def get_custom_workspace_for_user(page): 'extends': page, 'for_user': frappe.session.user } + filters['for_wiki'] = wiki pages = frappe.get_list("Workspace", filters=filters) if pages: return frappe.get_doc("Workspace", pages[0]) doc = frappe.new_doc("Workspace") doc.extends = page doc.for_user = frappe.session.user + doc.for_wiki = wiki return doc @@ -543,7 +549,7 @@ def save_customization(page, config): def save_new_widget(page, new_widgets): original_page = frappe.get_doc("Workspace", page) - page_doc = get_custom_workspace_for_user(page) + page_doc = get_custom_workspace_for_user(page, True) # Update field values page_doc.update({ @@ -576,7 +582,7 @@ def save_new_widget(page, new_widgets): clean_up(page_doc, page) # Set label - page_doc.label = page + '-' + frappe.session.user + page_doc.label = page + '-Wiki-' + frappe.session.user try: page_doc.save(ignore_permissions=True) diff --git a/frappe/desk/doctype/workspace/workspace.json b/frappe/desk/doctype/workspace/workspace.json index 386267b699..2de8eeef62 100644 --- a/frappe/desk/doctype/workspace/workspace.json +++ b/frappe/desk/doctype/workspace/workspace.json @@ -24,6 +24,7 @@ "pin_to_top", "pin_to_bottom", "hide_custom", + "for_wiki", "section_break_2", "charts_label", "charts", @@ -209,16 +210,22 @@ "options": "Workspace Link" }, { - "default": "0", - "depends_on": "extends_another_page", - "description": "Sets the current page as default for all users", - "fieldname": "is_default", - "fieldtype": "Check", - "label": "Is Default" - } + "default": "0", + "depends_on": "extends_another_page", + "description": "Sets the current page as default for all users", + "fieldname": "is_default", + "fieldtype": "Check", + "label": "Is Default" + }, + { + "default": "0", + "fieldname": "for_wiki", + "fieldtype": "Check", + "label": "For Wiki" + } ], "links": [], - "modified": "2021-01-21 12:09:36.156614", + "modified": "2021-06-02 15:35:08.963507", "modified_by": "Administrator", "module": "Desk", "name": "Workspace", @@ -248,4 +255,4 @@ ], "sort_field": "modified", "sort_order": "DESC" -} +} \ No newline at end of file diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index 06964a9d38..9acf3b72c7 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -172,7 +172,8 @@ frappe.views.Wiki = class Wiki { get_data(page) { return frappe.xcall("frappe.desk.desktop.get_desktop_page", { - page: page + page: page, + wiki: true }).then(data => { this.page_data = data; if (!this.page_data) return; From 32eb4f7c22a4396b6937b9f2ec0f3b2947550389 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Mon, 7 Jun 2021 12:39:05 +0530 Subject: [PATCH 034/306] fix: Public & Private Pages --- frappe/desk/desktop.py | 12 +- frappe/desk/doctype/internal_wiki/__init__.py | 0 .../doctype/internal_wiki/internal_wiki.js | 8 + .../doctype/internal_wiki/internal_wiki.json | 52 ++++ .../doctype/internal_wiki/internal_wiki.py | 114 +++++++++ .../internal_wiki/test_internal_wiki.py | 8 + .../internal_wiki_page.json | 42 +-- .../internal_wiki_page/internal_wiki_page.py | 72 ++---- frappe/public/js/frappe/views/wiki.js | 242 ++++++++++-------- frappe/public/scss/desk/wiki.scss | 38 ++- 10 files changed, 386 insertions(+), 202 deletions(-) create mode 100644 frappe/desk/doctype/internal_wiki/__init__.py create mode 100644 frappe/desk/doctype/internal_wiki/internal_wiki.js create mode 100644 frappe/desk/doctype/internal_wiki/internal_wiki.json create mode 100644 frappe/desk/doctype/internal_wiki/internal_wiki.py create mode 100644 frappe/desk/doctype/internal_wiki/test_internal_wiki.py diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index 8ea5738caf..1789f04924 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -365,6 +365,8 @@ def get_desktop_page(page, wiki=False): dict: dictionary of cards, charts and shortcuts to be displayed on website """ try: + if wiki and not frappe.db.exists("Workspace", page): + return wspace = Workspace(page, wiki=wiki) wspace.build_workspace() return { @@ -547,7 +549,7 @@ def save_customization(page, config): return True -def save_new_widget(page, new_widgets): +def save_new_widget(page, blocks, new_widgets): original_page = frappe.get_doc("Workspace", page) page_doc = get_custom_workspace_for_user(page, True) @@ -579,7 +581,7 @@ def save_new_widget(page, new_widgets): page_doc.build_links_table_from_card(widgets.card) # remove duplicate and unwanted widgets - clean_up(page_doc, page) + if widgets: clean_up(page_doc, blocks) # Set label page_doc.label = page + '-Wiki-' + frappe.session.user @@ -602,14 +604,12 @@ def save_new_widget(page, new_widgets): return True -def clean_up(original_page, page): +def clean_up(original_page, blocks): page_widgets = {} - content = frappe.db.get_value("Internal Wiki Page", page, "content") - for wid in ['shortcut', 'card', 'chart']: # get list of widget's name from internal wiki page - page_widgets[wid] = [x['data'][wid + '_name'] for x in json.loads(content) if x['type'] == wid] + page_widgets[wid] = [x['data'][wid + '_name'] for x in json.loads(blocks) if x['type'] == wid] # shortcut & chart cleanup for wid in ['shortcut', 'chart']: diff --git a/frappe/desk/doctype/internal_wiki/__init__.py b/frappe/desk/doctype/internal_wiki/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/desk/doctype/internal_wiki/internal_wiki.js b/frappe/desk/doctype/internal_wiki/internal_wiki.js new file mode 100644 index 0000000000..6c86ac23df --- /dev/null +++ b/frappe/desk/doctype/internal_wiki/internal_wiki.js @@ -0,0 +1,8 @@ +// Copyright (c) 2021, Frappe Technologies and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Internal Wiki', { + // refresh: function(frm) { + + // } +}); diff --git a/frappe/desk/doctype/internal_wiki/internal_wiki.json b/frappe/desk/doctype/internal_wiki/internal_wiki.json new file mode 100644 index 0000000000..64c75c47ce --- /dev/null +++ b/frappe/desk/doctype/internal_wiki/internal_wiki.json @@ -0,0 +1,52 @@ +{ + "actions": [], + "autoname": "field:title", + "creation": "2021-06-02 18:41:57.221425", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "title", + "wiki_pages" + ], + "fields": [ + { + "fieldname": "title", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Title", + "reqd": 1, + "unique": 1 + }, + { + "fieldname": "wiki_pages", + "fieldtype": "Table", + "label": "Wiki Pages", + "options": "Internal Wiki Page" + } + ], + "index_web_pages_for_search": 1, + "links": [], + "modified": "2021-06-03 12:47:50.146962", + "modified_by": "Administrator", + "module": "Desk", + "name": "Internal Wiki", + "owner": "Administrator", + "permissions": [ + { + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "share": 1, + "write": 1 + } + ], + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1 +} \ No newline at end of file diff --git a/frappe/desk/doctype/internal_wiki/internal_wiki.py b/frappe/desk/doctype/internal_wiki/internal_wiki.py new file mode 100644 index 0000000000..e4d08443d3 --- /dev/null +++ b/frappe/desk/doctype/internal_wiki/internal_wiki.py @@ -0,0 +1,114 @@ +# Copyright (c) 2021, Frappe Technologies and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe import _ +import json +from frappe.desk.desktop import save_new_widget +from frappe.desk.doctype.internal_wiki_page.internal_wiki_page import new_internal_wiki_page, delete_page, sort_page +from frappe.model.document import Document + +class InternalWiki(Document): + pass + +@frappe.whitelist() +def get_wiki_pages(): + has_access = ("System Manager" in frappe.get_roles()) + + default_pages = frappe.get_doc("Internal Wiki", "Default").wiki_pages + pages = prepare_pages(default_pages) + if not frappe.db.exists("Internal Wiki", frappe.session.user): + return {"pages": pages, "has_access": has_access} + + user_pages = frappe.get_doc("Internal Wiki", frappe.session.user).wiki_pages + user_pages = prepare_pages(user_pages, True) + pages.extend(user_pages) + + return {"pages": pages, "has_access": has_access} + +def prepare_pages(pages, is_editable=False): + prepared_pages = [] + for p in pages: + page = { + "title": p.title, + "icon": p.icon, + "parent_wiki": p.parent, + "parent_page": p.parent_page, + "content": p.content, + "is_editable": is_editable or ("System Manager" in frappe.get_roles()) + } + prepared_pages.append(page) + return prepared_pages + +@frappe.whitelist() +def save_wiki_page(title, parent, public, sb_items, deleted_pages, new_widgets, blocks, save=True): + if save: + # Create Workspace if not exist + if not frappe.db.exists("Workspace", title): + wspace = frappe.new_doc('Workspace') + wspace.label = title + wspace.for_wiki = 1 + wspace.insert(ignore_permissions=True) + + # create new Internal Wiki Page + new_doc = new_internal_wiki_page(title, blocks, parent, 'wiki_pages') + + if public: + doc = frappe.get_doc("Internal Wiki", "Default") + doc.wiki_pages.extend([new_doc]) + elif not frappe.db.exists("Internal Wiki", frappe.session.user): + doc = frappe.new_doc("Internal Wiki") + doc.title = frappe.session.user + doc.wiki_pages = [new_doc] + else: + doc = frappe.get_doc("Internal Wiki", frappe.session.user) + doc.wiki_pages.extend([new_doc]) + else: + # update the content of Internal Wiki Page of current user + doc = frappe.get_doc("Internal Wiki", frappe.session.user) + for d in doc.wiki_pages: + if d.title == title: + d.content = blocks + doc.save(ignore_permissions=True) + + if json.loads(deleted_pages): + return delete_pages(json.loads(deleted_pages)) + + if json.loads(sb_items): + sort_pages(json.loads(sb_items)) + + if json.loads(new_widgets): + save_new_widget(title, blocks, new_widgets) + + return title + +def delete_pages(deleted_pages): + for page in deleted_pages: + # delete default Internal Wiki Page + if "System Manager" in frappe.get_roles(): + delete_page("Default", page) + + # delete user's Internal Wiki Page + if frappe.db.exists("Internal Wiki", frappe.session.user): + delete_page(frappe.session.user, page) + + # delete Workspace + filters = { + 'extends': page.get("title"), + 'for_user': frappe.session.user, + 'for_wiki': 1 + } + pages = frappe.get_list("Workspace", filters=filters) + if pages: + frappe.get_doc("Workspace", pages[0]).delete() + return 'Home' + +def sort_pages(sb_items): + # update the index of default Internal Wiki Pages based on sorted sidebar pages + if "System Manager" in frappe.get_roles(): + sort_page("Default", sb_items) + + # update the index of user's Internal Wiki Pages based on sorted sidebar pages + if frappe.db.exists("Internal Wiki", frappe.session.user): + sort_page(frappe.session.user, sb_items) \ No newline at end of file diff --git a/frappe/desk/doctype/internal_wiki/test_internal_wiki.py b/frappe/desk/doctype/internal_wiki/test_internal_wiki.py new file mode 100644 index 0000000000..15fb04b822 --- /dev/null +++ b/frappe/desk/doctype/internal_wiki/test_internal_wiki.py @@ -0,0 +1,8 @@ +# Copyright (c) 2021, Frappe Technologies and Contributors +# See license.txt + +# import frappe +import unittest + +class TestInternalWiki(unittest.TestCase): + pass diff --git a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.json b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.json index 67180de25e..3bab22dbd0 100644 --- a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.json +++ b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.json @@ -1,6 +1,5 @@ { "actions": [], - "autoname": "field:title", "creation": "2021-05-02 14:44:26.490935", "doctype": "DocType", "editable_grid": 1, @@ -9,9 +8,6 @@ "title", "icon", "parent_page", - "column_break_4", - "sequence_id", - "private", "section_break_7", "content" ], @@ -21,8 +17,7 @@ "fieldtype": "Data", "in_list_view": 1, "label": "Title", - "reqd": 1, - "unique": 1 + "reqd": 1 }, { "fieldname": "icon", @@ -32,23 +27,8 @@ { "fieldname": "parent_page", "fieldtype": "Data", - "label": "Parent Page" - }, - { - "fieldname": "column_break_4", - "fieldtype": "Column Break" - }, - { - "fieldname": "sequence_id", - "fieldtype": "Int", "in_list_view": 1, - "label": "Sequence Id" - }, - { - "default": "0", - "fieldname": "private", - "fieldtype": "Check", - "label": "Private" + "label": "Parent Page" }, { "fieldname": "section_break_7", @@ -61,26 +41,14 @@ } ], "index_web_pages_for_search": 1, + "istable": 1, "links": [], - "modified": "2021-05-02 16:06:35.033197", + "modified": "2021-06-03 12:46:31.540481", "modified_by": "Administrator", "module": "Desk", "name": "Internal Wiki Page", "owner": "Administrator", - "permissions": [ - { - "create": 1, - "delete": 1, - "email": 1, - "export": 1, - "print": 1, - "read": 1, - "report": 1, - "role": "System Manager", - "share": 1, - "write": 1 - } - ], + "permissions": [], "sort_field": "modified", "sort_order": "DESC", "track_changes": 1 diff --git a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py index 392169b502..b73f7e1ddc 100644 --- a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py +++ b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py @@ -4,52 +4,32 @@ from __future__ import unicode_literals import frappe -import json -from frappe.desk.desktop import save_new_widget from frappe.model.document import Document class InternalWikiPage(Document): - - def before_insert(self): - sequence_id_list = frappe.get_all('Internal Wiki Page', {'sequence_id'}) - self.sequence_id = max([page.sequence_id for page in sequence_id_list] or [0]) + 1 - -@frappe.whitelist() -def save_wiki_page(title, parent, sb_items, deleted_pages, new_widgets, blocks, save=True): - if save: - if not frappe.db.exists("Workspace", title): - wspace = frappe.new_doc('Workspace') - wspace.label = title - wspace.insert() - - doc = frappe.new_doc('Internal Wiki Page') - doc.title = title - doc.parent_page = parent - doc.content = blocks - doc.insert() - else: - doc = frappe.get_doc('Internal Wiki Page', title) - doc.content = blocks - doc.save() - - if json.loads(sb_items): - for seq, d in enumerate(json.loads(sb_items)): - doc = frappe.get_doc('Internal Wiki Page', d.get('name')) - doc.sequence_id = seq + 1 - doc.parent_page = d.get('parent_page') or "" - doc.save() - doc.title = title - - if json.loads(deleted_pages): - for d in json.loads(deleted_pages): - wiki_doc = frappe.get_doc('Internal Wiki Page', d) - wiki_doc.delete() - wspace_doc = frappe.get_doc('Workspace', d) - if not wspace_doc.is_standard: - wspace_doc.delete() - return 'Build' - - if json.loads(new_widgets): - save_new_widget(title, new_widgets) - - return doc.title \ No newline at end of file + pass + +def new_internal_wiki_page(title, blocks, parent, parentfield): + new_doc = frappe.new_doc('Internal Wiki Page') + new_doc.title = title + new_doc.content = blocks + new_doc.parent_page = parent + new_doc.parentfield = parentfield + return new_doc + +def delete_page(user, wiki_page): + doc = frappe.get_doc("Internal Wiki", user) + for idx, page in enumerate(doc.wiki_pages): + if page.title == wiki_page.get("title") and page.parent == wiki_page.get("parent_wiki"): + del doc.wiki_pages[idx] + doc.save(ignore_permissions=True) + +def sort_page(user, pages): + doc = frappe.get_doc("Internal Wiki", user) + for seq, d in enumerate(pages): + for page in doc.wiki_pages: + if page.title == d.get('title'): + page.idx = seq + 1 + page.parent_page = d.get('parent_page') or "" + break + doc.save(ignore_permissions=True) \ No newline at end of file diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index 9acf3b72c7..29a5ea792a 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -57,41 +57,41 @@ frappe.views.Wiki = class Wiki { } setup_wiki_pages() { - this.get_pages().then(pages => { - this.all_pages = pages; + this.get_wiki_pages().then(pages => { + this.all_pages = pages.pages; + this.has_access = pages.has_access; if (this.all_pages) { frappe.wiki_pages = {}; - let root_pages = this.all_pages.filter(page => page.parent_page == '' || page.parent_page == null); for (let page of this.all_pages) { - frappe.wiki_pages[frappe.router.slug(page.name)] = page; + frappe.wiki_pages[frappe.router.slug(page.title)] = {name: page.title}; } if (this.new_page) { + if (!frappe.wiki_pages[frappe.router.slug(this.new_page)]) { + this.new_page = this.all_pages[0].title; + } frappe.set_route(`wiki/${frappe.router.slug(this.new_page)}`); this.new_page = null; } - this.make_sidebar(root_pages); + this.make_sidebar(); frappe.router.route(); } }); } - get_pages() { - return frappe.db.get_list('Internal Wiki Page', { - fields: ['name', 'icon', 'private', 'parent_page', 'sequence_id'], - order_by: "sequence_id asc" - }); + get_wiki_pages() { + return frappe.xcall("frappe.desk.doctype.internal_wiki.internal_wiki.get_wiki_pages"); } sidebar_item_container(item) { return $(` -
+
${frappe.utils.icon(item.icon || "folder-normal", "md")} - ${item.label || item.name} + ${item.label || item.title}
@@ -99,12 +99,13 @@ frappe.views.Wiki = class Wiki { `); } - make_sidebar(items) { + make_sidebar() { if (this.sidebar.find('.standard-sidebar-section')[0]) { this.sidebar.find('.standard-sidebar-section')[0].remove(); } + let root_pages = this.all_pages.filter(page => page.parent_page == '' || page.parent_page == null); let sidebar_section = $(`
`); - this.prepare_sidebar(items, sidebar_section, this.sidebar); + this.prepare_sidebar(root_pages, sidebar_section, this.sidebar); } prepare_sidebar(items, child_container, item_container) { @@ -113,10 +114,10 @@ frappe.views.Wiki = class Wiki { } append_item(item, container) { - let is_current_page = frappe.router.slug(item.name) == frappe.router.slug(this.get_page_to_show()); + let is_current_page = frappe.router.slug(item.title) == frappe.router.slug(this.get_page_to_show()); if (is_current_page) { item.selected = true; - this.current_page_name = item.name; + this.current_page_name = item.title; } let $item_container = this.sidebar_item_container(item); @@ -124,14 +125,14 @@ frappe.views.Wiki = class Wiki { this.add_sidebar_actions(item, sidebar_control); - let child_items = this.all_pages.filter(page => page.parent_page == item.name); + let child_items = this.all_pages.filter(page => page.parent_page == item.title); if (child_items.length > 0) { let child_container = $(``); this.prepare_sidebar(child_items, child_container, $item_container); } $item_container.appendTo(container); - this.sidebar_items[item.name] = $item_container; + this.sidebar_items[item.title] = $item_container; if ($item_container.parent().hasClass('hidden') && is_current_page) { $item_container.parent().toggleClass('hidden'); @@ -145,7 +146,7 @@ frappe.views.Wiki = class Wiki { let $drop_icon = $(``) .appendTo(sidebar_control); - if (this.all_pages.some(e => e.parent_page == item.name)) { + if (this.all_pages.some(e => e.parent_page == item.title)) { $drop_icon.removeClass('hidden'); $drop_icon.on('click', () => { let icon = $drop_icon.find("use").attr("href")==="#icon-small-down" ? "#icon-small-up" : "#icon-small-down"; @@ -176,11 +177,11 @@ frappe.views.Wiki = class Wiki { wiki: true }).then(data => { this.page_data = data; - if (!this.page_data) return; + if (!this.page_data || Object.keys(this.page_data).length === 0) return; return frappe.dashboard_utils.get_dashboard_settings().then(settings => { let chart_config = settings.chart_config ? JSON.parse(settings.chart_config) : {}; - if (this.page_data.charts.items) { + if (this.page_data.charts && this.page_data.charts.items) { this.page_data.charts.items.map(chart => { chart.chart_settings = chart_config[chart.chart_name] || {}; }); @@ -194,8 +195,8 @@ frappe.views.Wiki = class Wiki { if (localStorage.current_wiki_page) { default_page = localStorage.current_wiki_page; - } else if (this.all_pages) { - default_page = this.all_pages[0].name; + } else if (Object.keys(this.all_pages).length !== 0) { + default_page = this.all_pages[0].title; } else { default_page = "Build"; } @@ -224,75 +225,81 @@ frappe.views.Wiki = class Wiki { this.current_page_name = page; localStorage.current_wiki_page = page; - this.current_page = this.pages[page]; - if (!this.body.find('#editorjs')[0]) { this.$page = $(`
`).appendTo(this.body); } - this.setup_actions(); + this.setup_actions(page); this.prepare_editorjs(page); } prepare_editorjs(page) { - frappe.db.get_value("Internal Wiki Page", page, "content") - .then(content => { - this.content = JSON.parse(content.message["content"]); - this.get_data(page).then(() => { - if (this.editor) { - this.editor.isReady.then(() => { - this.editor.configuration.tools.chart.config.page_data = this.page_data; - this.editor.configuration.tools.shortcut.config.page_data = this.page_data; - this.editor.configuration.tools.card.config.page_data = this.page_data; - this.editor.render({ - blocks: this.content || [] - }); + if (this.all_pages) { + let this_page = this.all_pages.filter(p => p.title == page)[0]; + this.setup_actions(page); + this.content = this_page && JSON.parse(this_page.content); + this.get_data(page).then(() => { + if (this.editor) { + this.editor.isReady.then(() => { + this.editor.configuration.tools.chart.config.page_data = this.page_data; + this.editor.configuration.tools.shortcut.config.page_data = this.page_data; + this.editor.configuration.tools.card.config.page_data = this.page_data; + this.editor.render({ + blocks: this.content || [] }); - } else { - this.initialize_editorjs(this.content); - } - }); + }); + } else { + this.initialize_editorjs(this.content); + } }); + } } - setup_actions() { - if (!this.isReadOnly) return; + setup_actions(page) { + let this_page = this.all_pages.filter(p => p.title == page)[0]; + + if (!this.isReadOnly) { + this.setup_customization_buttons(this_page.is_editable); + return; + } + + this.page.clear_primary_action(); + this.page.clear_secondary_action(); this.page.clear_inner_toolbar(); - this.page.set_secondary_action( - __("Customize"), - () => { - this.isReadOnly = false; - this.editor.readOnly.toggle(); - this.editor.isReady - .then(() => { - this.initialize_editorjs_undo(); - this.setup_customization_buttons(); - this.show_sidebar_actions(); - this.make_sidebar_sortable(); - this.make_blocks_sortable(); - }); - }, - ); - this.page.add_inner_button(__('Create Page'), () => { + this_page.is_editable && this.page.set_secondary_action(__("Customize"), () => { + if (!this.editor || !this.editor.readOnly) return; + this.isReadOnly = false; + this.editor.readOnly.toggle(); + this.editor.isReady + .then(() => { + this.initialize_editorjs_undo(); + this.setup_customization_buttons(true); + this.show_sidebar_actions(); + this.make_sidebar_sortable(); + this.make_blocks_sortable(); + }); + }); + + this.page.add_inner_button(__("Create Page"), () => { this.initialize_new_page(); }); } initialize_editorjs_undo() { this.undo = new Undo({ editor: this.editor }); - this.undo.initialize({blocks: this.content}); + this.undo.initialize({blocks: this.content || []}); this.undo.readOnly = false; } - setup_customization_buttons() { + setup_customization_buttons(is_editable) { this.page.clear_primary_action(); this.page.clear_secondary_action(); this.page.clear_inner_toolbar(); - this.page.set_primary_action( + is_editable && this.page.set_primary_action( __("Save Customizations"), () => { this.page.clear_primary_action(); @@ -325,30 +332,39 @@ frappe.views.Wiki = class Wiki { } add_sidebar_actions(item, sidebar_control) { - frappe.utils.add_custom_button( - frappe.utils.icon('drag', 'xs'), - null, - "drag-handle", - `${__('Drag')}`, - null, - sidebar_control - ); - frappe.utils.add_custom_button( - frappe.utils.icon('delete', 'xs'), - () => this.delete_page(item.name), - "delete-page", - `${__('Delete')}`, - null, - sidebar_control - ); + if (!item.is_editable) { + $(`${frappe.utils.icon("solid-info", "sm")}`) + .appendTo(sidebar_control); + sidebar_control.find('.sidebar-info').click(() => { + frappe.show_alert({ + message: __("Only owner can sort of edit this page"), + indicator: 'info' + }, 5); + }); + } else{ + frappe.utils.add_custom_button( + frappe.utils.icon('drag', 'xs'), + null, + "drag-handle", + `${__('Drag')}`, + null, + sidebar_control + ); + frappe.utils.add_custom_button( + frappe.utils.icon('delete', 'xs'), + () => this.delete_page(item), + "delete-page", + `${__('Delete')}`, + null, + sidebar_control + ); + } } - delete_page(name) { - if (!this.deleted_sidebar_items.includes(name)) { - this.deleted_sidebar_items.push(name); - } - frappe.confirm(__("Are you sure you want to delete page {0}?", [name]), () => { - this.sidebar.find(`.standard-sidebar-section [item-name="${name}"]`).addClass('hidden'); + delete_page(item) { + frappe.confirm(__("Are you sure you want to delete page {0}?", [item.title]), () => { + this.deleted_sidebar_items.push(item); + this.sidebar.find(`.standard-sidebar-section [item-name="${item.title}"]`).addClass('hidden'); }); } @@ -357,28 +373,32 @@ frappe.views.Wiki = class Wiki { $('.nested-container').each( function() { new Sortable(this, { handle: ".drag-handle", - draggable: ".sidebar-item-container", + draggable: ".sidebar-item-container.is-draggable", group: 'nested', animation: 150, fallbackOnBody: true, swapThreshold: 0.65, onEnd: function () { - me.sorted_sidebar_items = []; - for (let page of $('.standard-sidebar-section').find('.sidebar-item-container')) { - let parent_page = ""; - if (page.closest('.nested-container').classList.contains('sidebar-child-item')) { - parent_page = page.parentElement.parentElement.attributes["item-name"].value; - } - me.sorted_sidebar_items.push({ - name: page.attributes['item-name'].value, - parent_page: parent_page - }); - } + me.prepare_sorted_sidebar(); } }); }); } + prepare_sorted_sidebar() { + this.sorted_sidebar_items = []; + for (let page of $('.standard-sidebar-section').find('.sidebar-item-container')) { + let parent_page = ""; + if (page.closest('.nested-container').classList.contains('sidebar-child-item')) { + parent_page = page.parentElement.parentElement.attributes["item-name"].value; + } + this.sorted_sidebar_items.push({ + title: page.attributes['item-name'].value, + parent_page: parent_page + }); + } + } + make_blocks_sortable() { let me = this; this.page_sortable = Sortable.create(this.page.main.find(".codex-editor__redactor").get(0), { @@ -395,6 +415,10 @@ frappe.views.Wiki = class Wiki { } initialize_new_page() { + let parent_pages = this.all_pages.filter(page => !page.parent_page && page.parent_wiki != "Default").map(page => page.title) + if (this.has_access) { + parent_pages = this.all_pages.filter(page => !page.parent_page).map(page => page.title) + } const d = new frappe.ui.Dialog({ title: __('Set Title'), fields: [ @@ -408,16 +432,23 @@ frappe.views.Wiki = class Wiki { label: __('Parent'), fieldtype: 'Select', fieldname: 'parent', - options: this.all_pages.filter(page => !page.parent_page).map(page => page.name) + options: parent_pages + }, + { + label: __('Public'), + fieldtype: 'Check', + fieldname: 'public', + depends_on: `eval:${this.has_access}` } ], primary_action_label: __('Create'), primary_action: (values) => { d.hide(); this.initialize_editorjs_undo(); - this.setup_customization_buttons(); + this.setup_customization_buttons(true); this.title = values.title; this.parent = values.parent; + this.public = values.public; this.editor.render({ blocks: [ { @@ -437,6 +468,7 @@ frappe.views.Wiki = class Wiki { this.show_sidebar_actions(); this.make_sidebar_sortable(); this.make_blocks_sortable(); + this.prepare_sorted_sidebar(); }); } }); @@ -446,8 +478,8 @@ frappe.views.Wiki = class Wiki { add_page_to_sidebar({title, parent}) { let $sidebar = $('.standard-sidebar-section'); let item = { - name: title, - parent_page: parent, + title: title, + parent_page: parent }; let $sidebar_item = this.sidebar_item_container(item); @@ -513,10 +545,11 @@ frappe.views.Wiki = class Wiki { }); frappe.call({ - method: "frappe.desk.doctype.internal_wiki_page.internal_wiki_page.save_wiki_page", + method: "frappe.desk.doctype.internal_wiki.internal_wiki.save_wiki_page", args: { title: me.title, parent: me.parent || '', + public: me.public || false, sb_items: me.sorted_sidebar_items, deleted_pages: me.deleted_sidebar_items, new_widgets: new_widgets, @@ -529,6 +562,7 @@ frappe.views.Wiki = class Wiki { frappe.show_alert({ message: __("Page Saved Successfully"), indicator: "green" }); me.title = ''; me.parent = ''; + me.public = false; me.sorted_sidebar_items = []; me.deleted_sidebar_items = []; me.new_page = res.message; diff --git a/frappe/public/scss/desk/wiki.scss b/frappe/public/scss/desk/wiki.scss index e9dcb63c4e..cf452d65c5 100644 --- a/frappe/public/scss/desk/wiki.scss +++ b/frappe/public/scss/desk/wiki.scss @@ -5,7 +5,24 @@ .layout-side-section, .layout-main-section-wrapper { height: 100%; overflow-y: auto; + padding-right: 25px; + scrollbar-color: var(--gray-200) transparent; + [data-theme="dark"] & { + scrollbar-color: var(--gray-800) transparent; + } + + &::-webkit-scrollbar-track { + background: transparent; + } + + &::-webkit-scrollbar-thumb { + background: var(--gray-200); + [data-theme="dark"] & { + background: var(--gray-800); + } + } } + .desk-sidebar { margin-bottom: var(--margin-2xl); } @@ -40,6 +57,10 @@ margin-right: -8px; } + .sidebar-info { + display: none; + } + svg { margin-right: 0; } @@ -69,7 +90,8 @@ .standard-sidebar-section.show-control { .desk-sidebar-item.standard-sidebar-item { - &:hover { + + &:hover, &.selected { .drag-handle { display: inline-block; } @@ -77,17 +99,15 @@ .delete-page { display: inline-block; } - } - - &.selected { - .drag-handle { - display: inline-block; - } - - .delete-page { + + .sidebar-info { display: inline-block; } } + + .block-click { + pointer-events:none; + } } } } From afd44ea349653b84375f523b84ded06849f8ea3b Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 9 Jun 2021 13:42:07 +0530 Subject: [PATCH 035/306] fix: sider fix --- frappe/desk/desktop.py | 3 ++- frappe/desk/doctype/internal_wiki/internal_wiki.py | 1 - frappe/public/js/frappe/views/wiki.js | 10 ++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index 1789f04924..042093d412 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -581,7 +581,8 @@ def save_new_widget(page, blocks, new_widgets): page_doc.build_links_table_from_card(widgets.card) # remove duplicate and unwanted widgets - if widgets: clean_up(page_doc, blocks) + if widgets: + clean_up(page_doc, blocks) # Set label page_doc.label = page + '-Wiki-' + frappe.session.user diff --git a/frappe/desk/doctype/internal_wiki/internal_wiki.py b/frappe/desk/doctype/internal_wiki/internal_wiki.py index e4d08443d3..de7482e434 100644 --- a/frappe/desk/doctype/internal_wiki/internal_wiki.py +++ b/frappe/desk/doctype/internal_wiki/internal_wiki.py @@ -3,7 +3,6 @@ from __future__ import unicode_literals import frappe -from frappe import _ import json from frappe.desk.desktop import save_new_widget from frappe.desk.doctype.internal_wiki_page.internal_wiki_page import new_internal_wiki_page, delete_page, sort_page diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index 29a5ea792a..5a41cf0968 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -341,7 +341,7 @@ frappe.views.Wiki = class Wiki { indicator: 'info' }, 5); }); - } else{ + } else { frappe.utils.add_custom_button( frappe.utils.icon('drag', 'xs'), null, @@ -415,9 +415,11 @@ frappe.views.Wiki = class Wiki { } initialize_new_page() { - let parent_pages = this.all_pages.filter(page => !page.parent_page && page.parent_wiki != "Default").map(page => page.title) + let parent_pages = this.all_pages + .filter(page => !page.parent_page && page.parent_wiki != "Default") + .map(page => page.title); if (this.has_access) { - parent_pages = this.all_pages.filter(page => !page.parent_page).map(page => page.title) + parent_pages = this.all_pages.filter(page => !page.parent_page).map(page => page.title); } const d = new frappe.ui.Dialog({ title: __('Set Title'), @@ -549,7 +551,7 @@ frappe.views.Wiki = class Wiki { args: { title: me.title, parent: me.parent || '', - public: me.public || false, + public: me.public || null, sb_items: me.sorted_sidebar_items, deleted_pages: me.deleted_sidebar_items, new_widgets: new_widgets, From a8a813623b09593ce4df1da2ef05cd0f81619aba Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 9 Jun 2021 18:12:44 +0530 Subject: [PATCH 036/306] fix: updating workspace of public page fix --- frappe/desk/desktop.py | 28 +++++++++++++++---- .../doctype/internal_wiki/internal_wiki.py | 17 ++++++----- frappe/desk/doctype/workspace/workspace.json | 9 +++++- frappe/public/js/frappe/wiki_blocks/block.js | 3 +- frappe/public/js/frappe/wiki_blocks/card.js | 3 +- frappe/public/js/frappe/wiki_blocks/chart.js | 3 +- .../public/js/frappe/wiki_blocks/shortcut.js | 3 +- 7 files changed, 49 insertions(+), 17 deletions(-) diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index 042093d412..e042e5411c 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -110,9 +110,18 @@ class Workspace: def get_page_for_user(self, wiki=False): filters = { 'extends': self.page_name, - 'for_user': frappe.session.user + 'public': 1, + 'for_wiki': wiki + } + user_pages = frappe.get_all("Workspace", filters=filters, limit=1) + if user_pages: + return frappe.get_cached_doc("Workspace", user_pages[0]) + + filters = { + 'extends': self.page_name, + 'for_user': frappe.session.user, + 'for_wiki': wiki } - filters['for_wiki'] = wiki user_pages = frappe.get_all("Workspace", filters=filters, limit=1) if user_pages: return frappe.get_cached_doc("Workspace", user_pages[0]) @@ -476,11 +485,19 @@ def get_custom_workspace_for_user(page, wiki=False): Returns: Object: Document object """ + if wiki: + filters = { + 'extends': page, + 'public': 1 + } + pages = frappe.get_list("Workspace", filters=filters) + if pages: + return frappe.get_doc("Workspace", pages[0]) filters = { 'extends': page, - 'for_user': frappe.session.user + 'for_user': frappe.session.user, + 'for_wiki': wiki } - filters['for_wiki'] = wiki pages = frappe.get_list("Workspace", filters=filters) if pages: return frappe.get_doc("Workspace", pages[0]) @@ -549,7 +566,7 @@ def save_customization(page, config): return True -def save_new_widget(page, blocks, new_widgets): +def save_new_widget(page, blocks, new_widgets, public=False): original_page = frappe.get_doc("Workspace", page) page_doc = get_custom_workspace_for_user(page, True) @@ -569,6 +586,7 @@ def save_new_widget(page, blocks, new_widgets): "charts": original_page.charts, "shortcuts": original_page.shortcuts, "links": original_page.links, + "public": public }) widgets = _dict(loads(new_widgets)) diff --git a/frappe/desk/doctype/internal_wiki/internal_wiki.py b/frappe/desk/doctype/internal_wiki/internal_wiki.py index de7482e434..15524a668c 100644 --- a/frappe/desk/doctype/internal_wiki/internal_wiki.py +++ b/frappe/desk/doctype/internal_wiki/internal_wiki.py @@ -63,13 +63,16 @@ def save_wiki_page(title, parent, public, sb_items, deleted_pages, new_widgets, else: doc = frappe.get_doc("Internal Wiki", frappe.session.user) doc.wiki_pages.extend([new_doc]) + doc.save(ignore_permissions=True) else: - # update the content of Internal Wiki Page of current user - doc = frappe.get_doc("Internal Wiki", frappe.session.user) - for d in doc.wiki_pages: - if d.title == title: - d.content = blocks - doc.save(ignore_permissions=True) + for page in ["Default", frappe.session.user]: + if frappe.db.exists("Internal Wiki", page): + doc = frappe.get_doc("Internal Wiki", page) + for d in doc.wiki_pages: + if d.title == title: + d.content = blocks + break + doc.save(ignore_permissions=True) if json.loads(deleted_pages): return delete_pages(json.loads(deleted_pages)) @@ -78,7 +81,7 @@ def save_wiki_page(title, parent, public, sb_items, deleted_pages, new_widgets, sort_pages(json.loads(sb_items)) if json.loads(new_widgets): - save_new_widget(title, blocks, new_widgets) + save_new_widget(title, blocks, new_widgets, public) return title diff --git a/frappe/desk/doctype/workspace/workspace.json b/frappe/desk/doctype/workspace/workspace.json index 2de8eeef62..6b84b73e6c 100644 --- a/frappe/desk/doctype/workspace/workspace.json +++ b/frappe/desk/doctype/workspace/workspace.json @@ -25,6 +25,7 @@ "pin_to_bottom", "hide_custom", "for_wiki", + "public", "section_break_2", "charts_label", "charts", @@ -222,10 +223,16 @@ "fieldname": "for_wiki", "fieldtype": "Check", "label": "For Wiki" + }, + { + "default": "0", + "fieldname": "public", + "fieldtype": "Check", + "label": "Public" } ], "links": [], - "modified": "2021-06-02 15:35:08.963507", + "modified": "2021-06-09 14:50:41.204381", "modified_by": "Administrator", "module": "Desk", "name": "Workspace", diff --git a/frappe/public/js/frappe/wiki_blocks/block.js b/frappe/public/js/frappe/wiki_blocks/block.js index a3f95890c7..dde93b3887 100644 --- a/frappe/public/js/frappe/wiki_blocks/block.js +++ b/frappe/public/js/frappe/wiki_blocks/block.js @@ -9,7 +9,7 @@ export default class Block { let block_data = this.config.page_data[block+'s'].items.find(obj => { return obj.label == block_name; }); - if (!block_data) return; + if (!block_data) return false; this.wrapper.innerHTML = ''; block_data.in_customize_mode = !this.readOnly; this.block_widget = new frappe.widget.SingleWidgetGroup({ @@ -25,6 +25,7 @@ export default class Block { if (!this.readOnly) { this.block_widget.customize(); } + return true; } rendered() { diff --git a/frappe/public/js/frappe/wiki_blocks/card.js b/frappe/public/js/frappe/wiki_blocks/card.js index 0c8dc4ca82..e8abcea424 100644 --- a/frappe/public/js/frappe/wiki_blocks/card.js +++ b/frappe/public/js/frappe/wiki_blocks/card.js @@ -34,7 +34,8 @@ export default class Card extends Block { this.new('card', 'links'); if (this.data && this.data.card_name) { - this.make('card', this.data.card_name, 'links'); + let has_data = this.make('card', this.data.card_name, 'links'); + if (!has_data) return; } if (!this.readOnly) { diff --git a/frappe/public/js/frappe/wiki_blocks/chart.js b/frappe/public/js/frappe/wiki_blocks/chart.js index 505d03c732..aeaba1d0d3 100644 --- a/frappe/public/js/frappe/wiki_blocks/chart.js +++ b/frappe/public/js/frappe/wiki_blocks/chart.js @@ -34,7 +34,8 @@ export default class Chart extends Block { this.new('chart'); if (this.data && this.data.chart_name) { - this.make('chart', this.data.chart_name); + let has_data = this.make('chart', this.data.chart_name); + if (!has_data) return; } if (!this.readOnly) { diff --git a/frappe/public/js/frappe/wiki_blocks/shortcut.js b/frappe/public/js/frappe/wiki_blocks/shortcut.js index 7de8097715..ffed50e340 100644 --- a/frappe/public/js/frappe/wiki_blocks/shortcut.js +++ b/frappe/public/js/frappe/wiki_blocks/shortcut.js @@ -33,7 +33,8 @@ export default class Shortcut extends Block { this.new('shortcut'); if (this.data && this.data.shortcut_name) { - this.make('shortcut', this.data.shortcut_name); + let has_data = this.make('shortcut', this.data.shortcut_name); + if (!has_data) return; } if (!this.readOnly) { From 769fadac0fd767769590248006ccbd07808f5165 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 9 Jun 2021 21:43:37 +0530 Subject: [PATCH 037/306] fix: Multiple Workspace creation fix --- frappe/desk/desktop.py | 114 ++++++++++-------- .../doctype/internal_wiki/internal_wiki.py | 13 +- frappe/desk/doctype/workspace/workspace.json | 8 +- frappe/public/js/frappe/views/wiki.js | 13 +- 4 files changed, 86 insertions(+), 62 deletions(-) diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index e042e5411c..01e929e3f5 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -42,7 +42,10 @@ class Workspace: self.user = frappe.get_user() self.allowed_modules = self.get_cached('user_allowed_modules', self.get_allowed_modules) - self.doc = self.get_page_for_user(wiki) + if wiki: + self.doc = self.get_wiki_page_for_user() + else: + self.doc = self.get_page_for_user() if self.doc.module and self.doc.module not in self.allowed_modules: raise frappe.PermissionError @@ -107,20 +110,10 @@ class Workspace: return self.user.allow_modules - def get_page_for_user(self, wiki=False): - filters = { - 'extends': self.page_name, - 'public': 1, - 'for_wiki': wiki - } - user_pages = frappe.get_all("Workspace", filters=filters, limit=1) - if user_pages: - return frappe.get_cached_doc("Workspace", user_pages[0]) - + def get_page_for_user(self): filters = { 'extends': self.page_name, 'for_user': frappe.session.user, - 'for_wiki': wiki } user_pages = frappe.get_all("Workspace", filters=filters, limit=1) if user_pages: @@ -138,6 +131,25 @@ class Workspace: self.get_pages_to_extend() return frappe.get_cached_doc("Workspace", self.page_name) + def get_wiki_page_for_user(self): + filters = { + 'wiki_label': self.page_name, + 'public': 1, + 'for_wiki': 1 + } + user_pages = frappe.get_all("Workspace", filters=filters, limit=1) + if user_pages: + return frappe.get_cached_doc("Workspace", user_pages[0]) + + filters = { + 'wiki_label': self.page_name, + 'for_user': frappe.session.user, + 'for_wiki': 1 + } + user_pages = frappe.get_all("Workspace", filters=filters, limit=1) + if user_pages: + return frappe.get_cached_doc("Workspace", user_pages[0]) + def get_onboarding_doc(self): # Check if onboarding is enabled if not frappe.get_system_settings("enable_onboarding"): @@ -374,7 +386,11 @@ def get_desktop_page(page, wiki=False): dict: dictionary of cards, charts and shortcuts to be displayed on website """ try: - if wiki and not frappe.db.exists("Workspace", page): + if wiki and not frappe.db.exists({ + 'doctype': 'Workspace', + 'wiki_label': page, + 'for_wiki': 1 + }): return wspace = Workspace(page, wiki=wiki) wspace.build_workspace() @@ -476,7 +492,7 @@ def get_custom_report_list(module): return out -def get_custom_workspace_for_user(page, wiki=False): +def get_custom_workspace_for_user(page): """Get custom page from workspace if exists or create one Args: @@ -485,18 +501,9 @@ def get_custom_workspace_for_user(page, wiki=False): Returns: Object: Document object """ - if wiki: - filters = { - 'extends': page, - 'public': 1 - } - pages = frappe.get_list("Workspace", filters=filters) - if pages: - return frappe.get_doc("Workspace", pages[0]) filters = { 'extends': page, 'for_user': frappe.session.user, - 'for_wiki': wiki } pages = frappe.get_list("Workspace", filters=filters) if pages: @@ -504,9 +511,43 @@ def get_custom_workspace_for_user(page, wiki=False): doc = frappe.new_doc("Workspace") doc.extends = page doc.for_user = frappe.session.user - doc.for_wiki = wiki return doc +def get_custom_wiki_for_user(page, public): + """Get custom page from workspace if exists or create one + + Args: + page (stirng): Page name + + Returns: + Object: Document object + """ + filters = { + 'wiki_label': page, + 'public': 1 + } + pages = frappe.get_list("Workspace", filters=filters) + if pages: + return frappe.get_doc("Workspace", pages[0]) + + filters = { + 'wiki_label': page, + 'for_user': frappe.session.user, + 'for_wiki': 1 + } + pages = frappe.get_list("Workspace", filters=filters) + if pages: + return frappe.get_doc("Workspace", pages[0]) + doc = frappe.new_doc("Workspace") + doc.wiki_label = page + doc.label = page + '-Wiki-' + frappe.session.user + doc.for_user = frappe.session.user + doc.for_wiki = 1 + doc.public = public + doc.charts = [] + doc.shortcuts = [] + doc.links = [] + return doc @frappe.whitelist() def save_customization(page, config): @@ -567,27 +608,7 @@ def save_customization(page, config): return True def save_new_widget(page, blocks, new_widgets, public=False): - original_page = frappe.get_doc("Workspace", page) - page_doc = get_custom_workspace_for_user(page, True) - - # Update field values - page_doc.update({ - "icon": original_page.icon, - "charts_label": original_page.charts_label, - "cards_label": original_page.cards_label, - "shortcuts_label": original_page.shortcuts_label, - "module": original_page.module, - "onboarding": original_page.onboarding, - "developer_mode_only": original_page.developer_mode_only, - "category": original_page.category, - }) - if page_doc.is_new(): - page_doc.update({ - "charts": original_page.charts, - "shortcuts": original_page.shortcuts, - "links": original_page.links, - "public": public - }) + page_doc = get_custom_wiki_for_user(page, public) widgets = _dict(loads(new_widgets)) @@ -602,9 +623,6 @@ def save_new_widget(page, blocks, new_widgets, public=False): if widgets: clean_up(page_doc, blocks) - # Set label - page_doc.label = page + '-Wiki-' + frappe.session.user - try: page_doc.save(ignore_permissions=True) except (ValidationError, TypeError) as e: diff --git a/frappe/desk/doctype/internal_wiki/internal_wiki.py b/frappe/desk/doctype/internal_wiki/internal_wiki.py index 15524a668c..a144d24c66 100644 --- a/frappe/desk/doctype/internal_wiki/internal_wiki.py +++ b/frappe/desk/doctype/internal_wiki/internal_wiki.py @@ -13,7 +13,7 @@ class InternalWiki(Document): @frappe.whitelist() def get_wiki_pages(): - has_access = ("System Manager" in frappe.get_roles()) + has_access = "System Manager" in frappe.get_roles() default_pages = frappe.get_doc("Internal Wiki", "Default").wiki_pages pages = prepare_pages(default_pages) @@ -41,15 +41,10 @@ def prepare_pages(pages, is_editable=False): return prepared_pages @frappe.whitelist() -def save_wiki_page(title, parent, public, sb_items, deleted_pages, new_widgets, blocks, save=True): +def save_wiki_page(title, parent, public, sb_items, deleted_pages, new_widgets, blocks, save): + save = frappe.parse_json(save) + public = frappe.parse_json(public) if save: - # Create Workspace if not exist - if not frappe.db.exists("Workspace", title): - wspace = frappe.new_doc('Workspace') - wspace.label = title - wspace.for_wiki = 1 - wspace.insert(ignore_permissions=True) - # create new Internal Wiki Page new_doc = new_internal_wiki_page(title, blocks, parent, 'wiki_pages') diff --git a/frappe/desk/doctype/workspace/workspace.json b/frappe/desk/doctype/workspace/workspace.json index 6b84b73e6c..2fe53c03be 100644 --- a/frappe/desk/doctype/workspace/workspace.json +++ b/frappe/desk/doctype/workspace/workspace.json @@ -10,6 +10,7 @@ "label", "for_user", "extends", + "wiki_label", "module", "category", "icon", @@ -229,10 +230,15 @@ "fieldname": "public", "fieldtype": "Check", "label": "Public" + }, + { + "fieldname": "wiki_label", + "fieldtype": "Data", + "label": "Wiki Label" } ], "links": [], - "modified": "2021-06-09 14:50:41.204381", + "modified": "2021-06-09 18:39:47.947069", "modified_by": "Administrator", "module": "Desk", "name": "Workspace", diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index 5a41cf0968..9a39577315 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -333,7 +333,7 @@ frappe.views.Wiki = class Wiki { add_sidebar_actions(item, sidebar_control) { if (!item.is_editable) { - $(`${frappe.utils.icon("solid-info", "sm")}`) + $(`${frappe.utils.icon("lock", "sm")}`) .appendTo(sidebar_control); sidebar_control.find('.sidebar-info').click(() => { frappe.show_alert({ @@ -428,7 +428,7 @@ frappe.views.Wiki = class Wiki { label: __('Title'), fieldtype: 'Data', fieldname: 'title', - "reqd": 1 + reqd: 1 }, { label: __('Parent'), @@ -445,6 +445,10 @@ frappe.views.Wiki = class Wiki { ], primary_action_label: __('Create'), primary_action: (values) => { + if (this.all_pages.filter(p => p.title == values.title)[0]) { + frappe.throw(__("Page with title '{0}' already exist.", [__(values.title)])); + return; + } d.hide(); this.initialize_editorjs_undo(); this.setup_customization_buttons(true); @@ -529,7 +533,8 @@ frappe.views.Wiki = class Wiki { let save = true; if (!this.title && this.current_page_name) { this.title = this.current_page_name; - save = ''; + this.public = this.all_pages.filter(p => p.title == this.title)[0].parent_wiki == "Default"; + save = false; } else { this.current_page_name = this.title; } @@ -551,7 +556,7 @@ frappe.views.Wiki = class Wiki { args: { title: me.title, parent: me.parent || '', - public: me.public || null, + public: me.public || 0, sb_items: me.sorted_sidebar_items, deleted_pages: me.deleted_sidebar_items, new_widgets: new_widgets, From 4bafae6e38d898096c49ce2bf5600f0772f05f17 Mon Sep 17 00:00:00 2001 From: Kenneth Sequeira Date: Sat, 12 Jun 2021 22:04:00 +0530 Subject: [PATCH 038/306] fix: add test cases --- frappe/tests/test_document.py | 26 ++++++++++++++++++++++++++ frappe/tests/test_fmt_money.py | 3 +++ frappe/tests/test_formatter.py | 23 ++++++++++++++++++++++- 3 files changed, 51 insertions(+), 1 deletion(-) diff --git a/frappe/tests/test_document.py b/frappe/tests/test_document.py index 1a5a8721fd..eca547e9bd 100644 --- a/frappe/tests/test_document.py +++ b/frappe/tests/test_document.py @@ -229,3 +229,29 @@ class TestDocument(unittest.TestCase): self.assertEqual(frappe.db.get_value("Currency", d.name), d.name) frappe.delete_doc_if_exists("Currency", "Frappe Coin", 1) + + def test_get_formatted(self): + frappe.get_doc({ + 'doctype': 'DocType', + 'name': 'Test Formatted', + 'module': 'Custom', + 'custom': 1, + 'istable': 1, + 'fields': [ + {'label': 'Currency', 'fieldname': 'currency', 'reqd': 1, 'fieldtype': 'Currency'}, + ] + }).insert() + + frappe.delete_doc_if_exists("Currency", "INR", 1) + + d = frappe.get_doc({ + 'doctype': 'Currency', + 'currency_name': 'INR', + 'symbol': '₹', + }).insert() + + d = frappe.get_doc({ + 'doctype': 'Test Formatted', + 'currency': 100000 + }) + self.assertEquals(d.get_formatted('curency', currency='INR', format="#,###.##"), '₹ 100,000.00') \ No newline at end of file diff --git a/frappe/tests/test_fmt_money.py b/frappe/tests/test_fmt_money.py index a1321658b7..8d76b4dcb4 100644 --- a/frappe/tests/test_fmt_money.py +++ b/frappe/tests/test_fmt_money.py @@ -94,6 +94,9 @@ class TestFmtMoney(unittest.TestCase): self.assertEqual(fmt_money(1000.456), "1.000,456") frappe.db.set_default("currency_precision", "") + def test_custom_fmt_money_format(self): + self.assertEqual(fmt_money(100000, format="#,###.##"), '100,000.00') + if __name__=="__main__": frappe.connect() unittest.main() \ No newline at end of file diff --git a/frappe/tests/test_formatter.py b/frappe/tests/test_formatter.py index 5257e1c717..5423d92520 100644 --- a/frappe/tests/test_formatter.py +++ b/frappe/tests/test_formatter.py @@ -22,4 +22,25 @@ class TestFormatter(unittest.TestCase): doc.currency = 'USD' self.assertEqual(format(100, df, doc), "$ 100.00") - frappe.db.set_default("currency", None) \ No newline at end of file + frappe.db.set_default("currency", None) + + def test_custom_currency_formatting(self): + df = frappe._dict({ + 'fieldname': 'amount', + 'fieldtype': 'Currency', + 'options': 'currency' + }) + + doc = frappe._dict({ + 'amount': 5 + }) + frappe.db.set_default("currency", 'INR') + + # if currency field is not passed then default currency should be used. + self.assertEqual(format(100000, df, doc, format="#,###.##"), '₹ 100,000.00') + + doc.currency = 'USD' + self.assertEqual(format(100000, df, doc, format="#,###.##"), '$ 100,000.00') + + frappe.db.set_default("currency", None) + \ No newline at end of file From 3336915dae72836ff85396f2c344422348bc9e8d Mon Sep 17 00:00:00 2001 From: Kenneth Sequeira Date: Sat, 12 Jun 2021 23:15:47 +0530 Subject: [PATCH 039/306] fix: test_document test --- frappe/tests/test_document.py | 1 - 1 file changed, 1 deletion(-) diff --git a/frappe/tests/test_document.py b/frappe/tests/test_document.py index eca547e9bd..a70f99aaad 100644 --- a/frappe/tests/test_document.py +++ b/frappe/tests/test_document.py @@ -236,7 +236,6 @@ class TestDocument(unittest.TestCase): 'name': 'Test Formatted', 'module': 'Custom', 'custom': 1, - 'istable': 1, 'fields': [ {'label': 'Currency', 'fieldname': 'currency', 'reqd': 1, 'fieldtype': 'Currency'}, ] From 13caf6910a4bc041a863db0106a9ec1b7b62668b Mon Sep 17 00:00:00 2001 From: Kenneth Sequeira Date: Tue, 15 Jun 2021 22:33:06 +0530 Subject: [PATCH 040/306] fix: test_document test fix --- frappe/tests/test_document.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/tests/test_document.py b/frappe/tests/test_document.py index a70f99aaad..ed4901a79a 100644 --- a/frappe/tests/test_document.py +++ b/frappe/tests/test_document.py @@ -253,4 +253,4 @@ class TestDocument(unittest.TestCase): 'doctype': 'Test Formatted', 'currency': 100000 }) - self.assertEquals(d.get_formatted('curency', currency='INR', format="#,###.##"), '₹ 100,000.00') \ No newline at end of file + self.assertEquals(d.get_formatted('currency', currency='INR', format="#,###.##"), '₹ 100,000.00') \ No newline at end of file From f5e40141af794ae770df3c39ee130a8509b07f50 Mon Sep 17 00:00:00 2001 From: Kenneth Sequeira Date: Tue, 15 Jun 2021 22:46:05 +0530 Subject: [PATCH 041/306] fix: readding test for test_formatter --- frappe/tests/test_formatter.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frappe/tests/test_formatter.py b/frappe/tests/test_formatter.py index 5423d92520..636f3d970d 100644 --- a/frappe/tests/test_formatter.py +++ b/frappe/tests/test_formatter.py @@ -40,7 +40,6 @@ class TestFormatter(unittest.TestCase): self.assertEqual(format(100000, df, doc, format="#,###.##"), '₹ 100,000.00') doc.currency = 'USD' - self.assertEqual(format(100000, df, doc, format="#,###.##"), '$ 100,000.00') + self.assertEqual(format(100000, df, doc, format="#,###.##"), "$ 100,000.00") frappe.db.set_default("currency", None) - \ No newline at end of file From bfc7c6b10c4dd234f9534e6de5089a4bcbb8cc6b Mon Sep 17 00:00:00 2001 From: shariquerik Date: Mon, 21 Jun 2021 14:42:19 +0530 Subject: [PATCH 042/306] fix: datetime field form validation fix --- frappe/public/js/frappe/form/controls/base_control.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/controls/base_control.js b/frappe/public/js/frappe/form/controls/base_control.js index d6c268a28a..ee40bbe43d 100644 --- a/frappe/public/js/frappe/form/controls/base_control.js +++ b/frappe/public/js/frappe/form/controls/base_control.js @@ -160,7 +160,13 @@ frappe.ui.form.Control = class BaseControl { validate_and_set_in_model(value, e) { var me = this; let force_value_set = (this.doc && this.doc.__run_link_triggers); - let is_value_same = (this.get_model_value() === value); + let model_value = this.get_model_value(); + + if (this.df && this.df.fieldtype == 'Datetime') { + model_value = frappe.datetime.get_datetime_as_string(model_value); + } + + let is_value_same = (model_value === value); if (this.inside_change_event || (!force_value_set && is_value_same)) { return Promise.resolve(); From af189de34b719173abd43bd0c05cf980ea7eaf32 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 22 Jun 2021 19:39:39 +0530 Subject: [PATCH 043/306] fix: Empty value for parent field --- frappe/public/js/frappe/views/wiki.js | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index 9a39577315..8ffa6f98c1 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -421,6 +421,7 @@ frappe.views.Wiki = class Wiki { if (this.has_access) { parent_pages = this.all_pages.filter(page => !page.parent_page).map(page => page.title); } + parent_pages.unshift(''); const d = new frappe.ui.Dialog({ title: __('Set Title'), fields: [ From aa6eec39e9648ba5bc0a6ec7442c6ae0df9eb7af Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 22 Jun 2021 19:39:57 +0530 Subject: [PATCH 044/306] fix: sider fix --- frappe/public/js/frappe/wiki_blocks/card.js | 4 ++-- frappe/public/js/frappe/wiki_blocks/chart.js | 4 ++-- frappe/public/js/frappe/wiki_blocks/header.js | 3 +-- frappe/public/js/frappe/wiki_blocks/paragraph.js | 5 ++--- frappe/public/js/frappe/wiki_blocks/shortcut.js | 4 ++-- frappe/public/js/frappe/wiki_blocks/spacer.js | 4 ++-- 6 files changed, 11 insertions(+), 13 deletions(-) diff --git a/frappe/public/js/frappe/wiki_blocks/card.js b/frappe/public/js/frappe/wiki_blocks/card.js index e8abcea424..6dd76b5c46 100644 --- a/frappe/public/js/frappe/wiki_blocks/card.js +++ b/frappe/public/js/frappe/wiki_blocks/card.js @@ -11,8 +11,8 @@ export default class Card extends Block { return true; } - constructor({data, api, config, readOnly, block}) { - super(arguments[0]); + constructor({ data, api, config, readOnly, block }) { + super({ data, api, config, readOnly, block }); this.sections = {}; this.col = this.data.col ? this.data.col : "12"; this.pt = this.data.pt ? this.data.pt : "0"; diff --git a/frappe/public/js/frappe/wiki_blocks/chart.js b/frappe/public/js/frappe/wiki_blocks/chart.js index aeaba1d0d3..30a576d0a9 100644 --- a/frappe/public/js/frappe/wiki_blocks/chart.js +++ b/frappe/public/js/frappe/wiki_blocks/chart.js @@ -11,8 +11,8 @@ export default class Chart extends Block { return true; } - constructor({data, api, config, readOnly, block}) { - super(arguments[0]); + constructor({ data, api, config, readOnly, block }) { + super({ data, api, config, readOnly, block }); this.col = this.data.col ? this.data.col : "12"; this.pt = this.data.pt ? this.data.pt : "0"; this.pr = this.data.pr ? this.data.pr : "0"; diff --git a/frappe/public/js/frappe/wiki_blocks/header.js b/frappe/public/js/frappe/wiki_blocks/header.js index eeb6054e63..69c62056aa 100644 --- a/frappe/public/js/frappe/wiki_blocks/header.js +++ b/frappe/public/js/frappe/wiki_blocks/header.js @@ -2,8 +2,7 @@ import Block from "./block.js"; export default class Header extends Block { constructor({ data, config, api, readOnly }) { - let opts = { config, api, readOnly }; - super(opts); + super({ config, api, readOnly }); this._CSS = { block: this.api.styles.block, diff --git a/frappe/public/js/frappe/wiki_blocks/paragraph.js b/frappe/public/js/frappe/wiki_blocks/paragraph.js index ebabcc98b6..655f7c2c1e 100644 --- a/frappe/public/js/frappe/wiki_blocks/paragraph.js +++ b/frappe/public/js/frappe/wiki_blocks/paragraph.js @@ -5,9 +5,8 @@ export default class Paragraph extends Block { return ''; } - constructor({data, config, api, readOnly}) { - let opts = {config, api, readOnly}; - super(opts); + constructor({ data, config, api, readOnly }) { + super({ config, api, readOnly }); this._CSS = { block: this.api.styles.block, diff --git a/frappe/public/js/frappe/wiki_blocks/shortcut.js b/frappe/public/js/frappe/wiki_blocks/shortcut.js index ffed50e340..1701431899 100644 --- a/frappe/public/js/frappe/wiki_blocks/shortcut.js +++ b/frappe/public/js/frappe/wiki_blocks/shortcut.js @@ -11,8 +11,8 @@ export default class Shortcut extends Block { return true; } - constructor({data, api, config, readOnly, block}) { - super(arguments[0]); + constructor({ data, api, config, readOnly, block }) { + super({ data, api, config, readOnly, block }); this.col = this.data.col ? this.data.col : "12"; this.pt = this.data.pt ? this.data.pt : "0"; this.pr = this.data.pr ? this.data.pr : "0"; diff --git a/frappe/public/js/frappe/wiki_blocks/spacer.js b/frappe/public/js/frappe/wiki_blocks/spacer.js index 4a97dbcb02..5994d49057 100644 --- a/frappe/public/js/frappe/wiki_blocks/spacer.js +++ b/frappe/public/js/frappe/wiki_blocks/spacer.js @@ -11,8 +11,8 @@ export default class Spacer extends Block { return true; } - constructor({data, api, config, readOnly}) { - super(arguments[0]); + constructor({ data, api, config, readOnly }) { + super({ data, api, config, readOnly }); this.col = this.data.col ? this.data.col : "12"; this.pt = this.data.pt ? this.data.pt : "0"; this.pr = this.data.pr ? this.data.pr : "0"; From 398e591ad1e65b3fb58f4f6c2d0dee0f481d9b6d Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 22 Jun 2021 20:44:35 +0530 Subject: [PATCH 045/306] fix: Removed unused libraries & fixed yarn.lock file --- package.json | 7 +- yarn.lock | 255 ++++++++++++++++++++++++--------------------------- 2 files changed, 122 insertions(+), 140 deletions(-) diff --git a/package.json b/package.json index ff5d1ebc83..323eb19df4 100644 --- a/package.json +++ b/package.json @@ -20,8 +20,7 @@ }, "homepage": "https://frappeframework.com", "dependencies": { - "@editorjs/editorjs": "^2.20.0", - "@editorjs/header": "^2.6.1", + "@editorjs/editorjs": "2.20.0", "ace-builds": "^1.4.8", "air-datepicker": "github:frappe/air-datepicker", "autoprefixer": "^9.8.6", @@ -31,6 +30,7 @@ "cookie": "^0.4.0", "cssnano": "^5.0.0", "driver.js": "^0.9.8", + "editorjs-undo": "0.1.6", "express": "^4.17.1", "fast-deep-equal": "^2.0.1", "frappe-charts": "^2.0.0-rc13", @@ -62,9 +62,6 @@ "vue-router": "^2.0.0" }, "devDependencies": { - "@editorjs/checklist": "^1.3.0", - "@editorjs/list": "^1.6.2", - "editorjs-undo": "^0.1.6", "chalk": "^2.3.2", "esbuild": "^0.11.21", "esbuild-plugin-postcss2": "^0.0.9", diff --git a/yarn.lock b/yarn.lock index 2388c0175e..4d08d006ee 100644 --- a/yarn.lock +++ b/yarn.lock @@ -30,35 +30,20 @@ "@deepcode/dcignore@^1.0.2": version "1.0.2" - resolved "https://registry.npmjs.org/@deepcode/dcignore/-/dcignore-1.0.2.tgz" + resolved "https://registry.yarnpkg.com/@deepcode/dcignore/-/dcignore-1.0.2.tgz#39e4a3df7dde8811925330506e4bb3fbf3c288d8" integrity sha512-DPgxtHuJwBORpqRkPXzzOT+uoPRVJmaN7LR+pmeL6DQM90kj6G6GFUH1i/YpRH8NbML8ZGEDwB9f9u4UwD2pzg== -"@editorjs/checklist@^1.3.0": - version "1.3.0" - resolved "https://registry.npmjs.org/@editorjs/checklist/-/checklist-1.3.0.tgz" - integrity sha512-087oW0oOIE5HX8llj4Eap/reFDFw8VCLlp6GU0E9GEp7f3zy2aV6KdFR+6dbYhZ50w7tSnkMpCAcSq1NXJeB4Q== - -"@editorjs/editorjs@^2.20.0": +"@editorjs/editorjs@2.20.0": version "2.20.0" - resolved "https://registry.npmjs.org/@editorjs/editorjs/-/editorjs-2.20.0.tgz" + resolved "https://registry.yarnpkg.com/@editorjs/editorjs/-/editorjs-2.20.0.tgz#1e0dc7e6c1433c34c9d2d3e42153313c2dbb3514" integrity sha512-e6DWi8bMypFhovq9R6cefaDWVfrlVU++Q7ABp79+MxZIuC/SKAW5EtxBbKPL22H/Mc3bJIhZCxOqEl70HBh2yw== dependencies: codex-notifier "^1.1.2" codex-tooltip "^1.0.1" -"@editorjs/header@^2.6.1": - version "2.6.1" - resolved "https://registry.npmjs.org/@editorjs/header/-/header-2.6.1.tgz" - integrity sha512-EsnyVFv5uThpU9tbQ/dUPFCQoa/sBFy2n+9tN3wOXJGx7sjea4fdcacJ2UYhO+7pCgZ+aSgmMOyGLYHUFbchvA== - -"@editorjs/list@^1.6.2": - version "1.6.2" - resolved "https://registry.npmjs.org/@editorjs/list/-/list-1.6.2.tgz" - integrity sha512-OxowV0yuE11G01czYM1dEQlz1F37ehX0ak5vAbZ9ncSXrPh0fDRw/fBxTY654FlmrsQ40UFom3owSG++tLvVGw== - "@nodelib/fs.scandir@2.1.4": version "2.1.4" - resolved "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz" + resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69" integrity sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA== dependencies: "@nodelib/fs.stat" "2.0.4" @@ -66,12 +51,12 @@ "@nodelib/fs.stat@2.0.4", "@nodelib/fs.stat@^2.0.2": version "2.0.4" - resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz#a3f2dd61bab43b8db8fa108a121cfffe4c676655" integrity sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q== "@nodelib/fs.walk@^1.2.3": version "1.2.6" - resolved "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz" + resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz#cce9396b30aa5afe9e3756608f5831adcb53d063" integrity sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow== dependencies: "@nodelib/fs.scandir" "2.1.4" @@ -79,12 +64,12 @@ "@octetstream/promisify@2.0.2": version "2.0.2" - resolved "https://registry.npmjs.org/@octetstream/promisify/-/promisify-2.0.2.tgz" + resolved "https://registry.yarnpkg.com/@octetstream/promisify/-/promisify-2.0.2.tgz#29ac3bd7aefba646db670227f895d812c1a19615" integrity sha512-7XHoRB61hxsz8lBQrjC1tq/3OEIgpvGWg6DKAdwi7WRzruwkmsdwmOoUXbU4Dtd4RSOMDwed0SkP3y8UlMt1Bg== "@open-policy-agent/opa-wasm@^1.2.0": version "1.2.0" - resolved "https://registry.npmjs.org/@open-policy-agent/opa-wasm/-/opa-wasm-1.2.0.tgz" + resolved "https://registry.yarnpkg.com/@open-policy-agent/opa-wasm/-/opa-wasm-1.2.0.tgz#481b766093f70b00efefbee1e4192f375fd34ca2" integrity sha512-CtUBTnzvDrT0NASa8IuGQTxFGgt2vxbLnMYuTA+uDFxOcA4uK4mGFgrhHJtxUZnWHiwemOvKKSY3BMCo7qiAsQ== dependencies: sprintf-js "^1.1.2" @@ -92,31 +77,31 @@ "@sindresorhus/is@^0.14.0": version "0.14.0" - resolved "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz" + resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== "@sindresorhus/is@^2.1.1": version "2.1.1" - resolved "https://registry.npmjs.org/@sindresorhus/is/-/is-2.1.1.tgz" + resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-2.1.1.tgz#ceff6a28a5b4867c2dd4a1ba513de278ccbe8bb1" integrity sha512-/aPsuoj/1Dw/kzhkgz+ES6TxG0zfTMGLwuK2ZG00k/iJzYHTLCE8mVU8EPqEOp/lmxPoq1C1C9RYToRKb2KEfg== "@snyk/cli-interface@2.11.0", "@snyk/cli-interface@^2.11.0": version "2.11.0" - resolved "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.11.0.tgz" + resolved "https://registry.yarnpkg.com/@snyk/cli-interface/-/cli-interface-2.11.0.tgz#9df68c8cd54de5dff69f0ab797a188541d9c8965" integrity sha512-T3xfDqrEFKclHGdJx4/5+D5F7e76/99f33guE4RTlVITBhy7VVnjz4t/NDr3UYqcC0MgAmiC4bSVYHnlshuwJw== dependencies: "@types/graphlib" "^2" "@snyk/cli-interface@^2.0.3": version "2.3.2" - resolved "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.3.2.tgz" + resolved "https://registry.yarnpkg.com/@snyk/cli-interface/-/cli-interface-2.3.2.tgz#e93afa82de15b912e657f1ba86f9d7963983e594" integrity sha512-jmZyxVHqzYU1GfdnWCGdd68WY/lAzpPVyqalHazPj4tFJehrSfEFc82RMTYAMgXEJuvFRFIwhsvXh3sWUhIQmg== dependencies: tslib "^1.9.3" "@snyk/cli-interface@^2.9.1", "@snyk/cli-interface@^2.9.2": version "2.9.2" - resolved "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.9.2.tgz" + resolved "https://registry.yarnpkg.com/@snyk/cli-interface/-/cli-interface-2.9.2.tgz#defbeafd5fa7fa5ab1c39d57f1d379b2fbfc9860" integrity sha512-C64bGtcQbh7941l7qgXFJ+FJIZdQtBHkPhKfGtUlCCMbC0FK0oaUmp6d7YPQxT4dEnkQdtlBT/eA2F6qIKbEng== dependencies: "@snyk/dep-graph" "1.19.4" @@ -125,7 +110,7 @@ "@snyk/cocoapods-lockfile-parser@3.6.2": version "3.6.2" - resolved "https://registry.npmjs.org/@snyk/cocoapods-lockfile-parser/-/cocoapods-lockfile-parser-3.6.2.tgz" + resolved "https://registry.yarnpkg.com/@snyk/cocoapods-lockfile-parser/-/cocoapods-lockfile-parser-3.6.2.tgz#803ae9466f408c48ba7c5a8ec51b9dbac6f633b3" integrity sha512-ca2JKOnSRzYHJkhOB9gYmdRZHmd02b/uBd/S0D5W+L9nIMS7sUBV5jfhKwVgrYPIpVNIc0XCI9rxK4TfkQRpiA== dependencies: "@snyk/dep-graph" "^1.23.1" @@ -135,7 +120,7 @@ "@snyk/code-client@3.4.0": version "3.4.0" - resolved "https://registry.npmjs.org/@snyk/code-client/-/code-client-3.4.0.tgz" + resolved "https://registry.yarnpkg.com/@snyk/code-client/-/code-client-3.4.0.tgz#7741abef6dcf5dfc50a1a0538918972360c5a1e7" integrity sha512-RY2IftAiWB7tp36Mcq7WiEwqoD8A/mqrD6N7oDWTxBOIqsH0t4djo/UibiWDJotaffO9aXXndOf3iZ/kTt+Rdg== dependencies: "@deepcode/dcignore" "^1.0.2" @@ -158,7 +143,7 @@ "@snyk/composer-lockfile-parser@^1.4.1": version "1.4.1" - resolved "https://registry.npmjs.org/@snyk/composer-lockfile-parser/-/composer-lockfile-parser-1.4.1.tgz" + resolved "https://registry.yarnpkg.com/@snyk/composer-lockfile-parser/-/composer-lockfile-parser-1.4.1.tgz#2f7c93ad367520322b16d9490a208fec08445e0e" integrity sha512-wNANv235j95NFsQuODIXCiQZ9kcyg9fz92Kg1zoGvaP3kN/ma7fgCnvQL/dyml6iouQJR5aZovjhrrfEFoKtiQ== dependencies: lodash.findkey "^4.6.0" @@ -168,7 +153,7 @@ "@snyk/dep-graph@1.19.4", "@snyk/dep-graph@^1.19.3": version "1.19.4" - resolved "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.19.4.tgz" + resolved "https://registry.yarnpkg.com/@snyk/dep-graph/-/dep-graph-1.19.4.tgz#d156c482bfdfba7505f1cf3e8a80b86dd9f45383" integrity sha512-h3MMhjVm3BuIruwpDBqnMowKOG9viwr3TJHdIxTHulWKWSsPTTW1AAP3/RaK+UBp1y/Ua9yzeHncKIrzBdT5Nw== dependencies: graphlib "^2.1.8" @@ -180,7 +165,7 @@ "@snyk/dep-graph@^1.21.0", "@snyk/dep-graph@^1.23.0", "@snyk/dep-graph@^1.23.1", "@snyk/dep-graph@^1.27.1", "@snyk/dep-graph@^1.28.0": version "1.28.0" - resolved "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.28.0.tgz" + resolved "https://registry.yarnpkg.com/@snyk/dep-graph/-/dep-graph-1.28.0.tgz#d68c0576cb3562c6e819ca8a8c7ac29ee11d9776" integrity sha512-Oup9nAvb558jdNvbZah/vaBtOtCcizkdeS+OBQeBIqIffyer4mc4juSn4b1SFjCpu7AG7piio8Lj8k1B9ps6Tg== dependencies: event-loop-spinner "^2.1.0" @@ -205,7 +190,7 @@ "@snyk/docker-registry-v2-client@1.13.9": version "1.13.9" - resolved "https://registry.npmjs.org/@snyk/docker-registry-v2-client/-/docker-registry-v2-client-1.13.9.tgz" + resolved "https://registry.yarnpkg.com/@snyk/docker-registry-v2-client/-/docker-registry-v2-client-1.13.9.tgz#54c2e3071de58fc6fc12c5fef5eaeae174ecda12" integrity sha512-DIFLEhr8m1GrAwsLGInJmpcQMacjuhf3jcbpQTR+LeMvZA9IuKq+B7kqw2O2FzMiHMZmUb5z+tV+BR7+IUHkFQ== dependencies: needle "^2.5.0" @@ -214,7 +199,7 @@ "@snyk/fast-glob@^3.2.6-patch": version "3.2.6-patch" - resolved "https://registry.npmjs.org/@snyk/fast-glob/-/fast-glob-3.2.6-patch.tgz" + resolved "https://registry.yarnpkg.com/@snyk/fast-glob/-/fast-glob-3.2.6-patch.tgz#a0866bedb17f95255e4050dad08daeaff0f4caa8" integrity sha512-E/Pfdze/WFfxwyuTFcfhQN1SwyUsc43yuCoW63RVBCaxTD6OzhVD2Pvc/Sy7BjiWUfmelzyKkIBpoow8zZX7Zg== dependencies: "@nodelib/fs.stat" "^2.0.2" @@ -226,7 +211,7 @@ "@snyk/fix@1.518.0": version "1.518.0" - resolved "https://registry.npmjs.org/@snyk/fix/-/fix-1.518.0.tgz" + resolved "https://registry.yarnpkg.com/@snyk/fix/-/fix-1.518.0.tgz#8af97a17da737739b1f31fe2d2129c99fcb574ed" integrity sha512-Cwh0wU8SxZgx1+qRgcGkMctNx9F6UCdUJYcCvKaYJNDEYQwpQat4nsLZsJeODYNx7Byh0ZnPrqakUck4qFrPvA== dependencies: "@snyk/dep-graph" "^1.21.0" @@ -239,19 +224,19 @@ "@snyk/gemfile@1.2.0": version "1.2.0" - resolved "https://registry.npmjs.org/@snyk/gemfile/-/gemfile-1.2.0.tgz" + resolved "https://registry.yarnpkg.com/@snyk/gemfile/-/gemfile-1.2.0.tgz#919857944973cce74c650e5428aaf11bcd5c0457" integrity sha512-nI7ELxukf7pT4/VraL4iabtNNMz8mUo7EXlqCFld8O5z6mIMLX9llps24iPpaIZOwArkY3FWA+4t+ixyvtTSIA== "@snyk/glob-parent@^5.1.2-patch.1": version "5.1.2-patch.1" - resolved "https://registry.npmjs.org/@snyk/glob-parent/-/glob-parent-5.1.2-patch.1.tgz" + resolved "https://registry.yarnpkg.com/@snyk/glob-parent/-/glob-parent-5.1.2-patch.1.tgz#87733b4ab282043fa7915200bc94cb391df6d44f" integrity sha512-OkUPdHgxIWKAAzceG1nraNA0kgI+eS0I9wph8tll9UL0slD2mIWSj4mAqroGovaEXm8nHedoUfuDRGEb6wnzCQ== dependencies: is-glob "^4.0.1" "@snyk/graphlib@2.1.9-patch.3", "@snyk/graphlib@^2.1.9-patch.3": version "2.1.9-patch.3" - resolved "https://registry.npmjs.org/@snyk/graphlib/-/graphlib-2.1.9-patch.3.tgz" + resolved "https://registry.yarnpkg.com/@snyk/graphlib/-/graphlib-2.1.9-patch.3.tgz#b8edb2335af1978db7f3cb1f28f5d562960acf23" integrity sha512-bBY9b9ulfLj0v2Eer0yFYa3syVeIxVKl2EpxSrsVeT4mjA0CltZyHsF0JjoaGXP27nItTdJS5uVsj1NA+3aE+Q== dependencies: lodash.clone "^4.5.0" @@ -272,7 +257,7 @@ "@snyk/inquirer@^7.3.3-patch": version "7.3.3-patch" - resolved "https://registry.npmjs.org/@snyk/inquirer/-/inquirer-7.3.3-patch.tgz" + resolved "https://registry.yarnpkg.com/@snyk/inquirer/-/inquirer-7.3.3-patch.tgz#ef84d531724c53b755e8dd454e1a3c2ccdcfc0bf" integrity sha512-aWiQSOacH2lOpJ1ard9ErABcH4tdJogdr+mg1U67iZJOPO9n2gFgAwz1TQJDyPkv4/A5mh4hT2rg03Uq+KBn2Q== dependencies: ansi-escapes "^4.2.1" @@ -309,7 +294,7 @@ "@snyk/java-call-graph-builder@1.19.1": version "1.19.1" - resolved "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.19.1.tgz" + resolved "https://registry.yarnpkg.com/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.19.1.tgz#1d579d782df3bb5f9d5171cc35180596cd90aa8b" integrity sha512-bxjHef5Qm3pNc+BrFlxMudmSSbOjA395ZqBddc+dvsFHoHeyNbiY56Y1JSGUlTgjRM+PKNPBiCuELTSMaROeZg== dependencies: "@snyk/graphlib" "2.1.9-patch.3" @@ -328,7 +313,7 @@ "@snyk/java-call-graph-builder@1.20.0": version "1.20.0" - resolved "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.20.0.tgz" + resolved "https://registry.yarnpkg.com/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.20.0.tgz#ffca734cf7ce276a69277963149358190eaac3e5" integrity sha512-NX8bpIu7oG5cuSSm6WvtxqcCuJs2gRjtKhtuSeF1p5TYXyESs3FXQ0nHjfY90LiyTTc+PW/UBq6SKbBA6bCBww== dependencies: "@snyk/graphlib" "2.1.9-patch.3" @@ -347,7 +332,7 @@ "@snyk/mix-parser@^1.1.0": version "1.1.1" - resolved "https://registry.npmjs.org/@snyk/mix-parser/-/mix-parser-1.1.1.tgz" + resolved "https://registry.yarnpkg.com/@snyk/mix-parser/-/mix-parser-1.1.1.tgz#3493222b4e3d84a6fb56bce5238922a532a81191" integrity sha512-KmX4Le+1M01m6kM2UeDColzMZctrSqoMGajqcRHR3dLpCyHE3nzZzPeOWjbUVgjQlTX07oQvq9udSJGZJ/+Gdg== dependencies: "@snyk/dep-graph" "^1.28.0" @@ -355,14 +340,14 @@ "@snyk/rpm-parser@^2.0.0": version "2.0.0" - resolved "https://registry.npmjs.org/@snyk/rpm-parser/-/rpm-parser-2.0.0.tgz" + resolved "https://registry.yarnpkg.com/@snyk/rpm-parser/-/rpm-parser-2.0.0.tgz#4ded7fa4b0a8efca7699359e4ca7a79bfbe38bc1" integrity sha512-bWjQY5Xk3TcfVpeo8M5BhhSUEdPr2P19AWW13CHPu6sFZkckLWEcjQycnBsVD6RBmxGXecJ1YNui8dq6soHoYQ== dependencies: event-loop-spinner "^2.0.0" "@snyk/snyk-cocoapods-plugin@2.5.2": version "2.5.2" - resolved "https://registry.npmjs.org/@snyk/snyk-cocoapods-plugin/-/snyk-cocoapods-plugin-2.5.2.tgz" + resolved "https://registry.yarnpkg.com/@snyk/snyk-cocoapods-plugin/-/snyk-cocoapods-plugin-2.5.2.tgz#cd724fcd637cb3af76187bf7254819b6079489f6" integrity sha512-WHhnwyoGOhjFOjBXqUfszD84SErrtjHjium/4xFbqKpEE+yuwxs8OwV/S29BtxhYiGtjpD1azv5QtH30VUMl0A== dependencies: "@snyk/cli-interface" "^2.11.0" @@ -373,7 +358,7 @@ "@snyk/snyk-docker-pull@3.2.3": version "3.2.3" - resolved "https://registry.npmjs.org/@snyk/snyk-docker-pull/-/snyk-docker-pull-3.2.3.tgz" + resolved "https://registry.yarnpkg.com/@snyk/snyk-docker-pull/-/snyk-docker-pull-3.2.3.tgz#9743ea624098c7abd0f95c438c76067530494f4b" integrity sha512-hiFiSmWGLc2tOI7FfgIhVdFzO2f69im8O6p3OV4xEZ/Ss1l58vwtqudItoswsk7wj/azRlgfBW8wGu2MjoudQg== dependencies: "@snyk/docker-registry-v2-client" "1.13.9" @@ -383,7 +368,7 @@ "@snyk/snyk-hex-plugin@1.0.0": version "1.0.0" - resolved "https://registry.npmjs.org/@snyk/snyk-hex-plugin/-/snyk-hex-plugin-1.0.0.tgz" + resolved "https://registry.yarnpkg.com/@snyk/snyk-hex-plugin/-/snyk-hex-plugin-1.0.0.tgz#617c91b5c19a6ccbb3a9a1a87d9e87b84621bdb3" integrity sha512-ZydVdZ5kDpPDoehQnNHN3wZ6c470k5DPLJtWMoyfzlnCU2+y1rsUEdn4yhttn60RPx3JiLGwmckeDvZw8BqnGQ== dependencies: "@snyk/dep-graph" "^1.28.0" @@ -393,14 +378,14 @@ "@szmarczak/http-timer@^1.1.2": version "1.1.2" - resolved "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz" + resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA== dependencies: defer-to-connect "^1.0.1" "@szmarczak/http-timer@^4.0.5": version "4.0.5" - resolved "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.5.tgz" + resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.5.tgz#bfbd50211e9dfa51ba07da58a14cdfd333205152" integrity sha512-PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ== dependencies: defer-to-connect "^2.0.0" @@ -424,12 +409,12 @@ "@types/braces@*": version "3.0.0" - resolved "https://registry.npmjs.org/@types/braces/-/braces-3.0.0.tgz" + resolved "https://registry.yarnpkg.com/@types/braces/-/braces-3.0.0.tgz#7da1c0d44ff1c7eb660a36ec078ea61ba7eb42cb" integrity sha512-TbH79tcyi9FHwbyboOKeRachRq63mSuWYXOflsNO9ZyE5ClQ/JaozNKl+aWUq87qPNsXasXxi2AbgfwIJ+8GQw== "@types/cacheable-request@^6.0.1": version "6.0.1" - resolved "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.1.tgz" + resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.1.tgz#5d22f3dded1fd3a84c0bbeb5039a7419c2c91976" integrity sha512-ykFq2zmBGOCbpIXtoVbz4SKY5QriWPh3AjyU4G74RYbtt5yOc5OfaY75ftjg7mikMOla1CTGpX3lLbuJh8DTrQ== dependencies: "@types/http-cache-semantics" "*" @@ -439,77 +424,77 @@ "@types/color-name@^1.1.1": version "1.1.1" - resolved "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz" + resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0" integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ== "@types/debug@^4.1.4": version "4.1.5" - resolved "https://registry.npmjs.org/@types/debug/-/debug-4.1.5.tgz" + resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.5.tgz#b14efa8852b7768d898906613c23f688713e02cd" integrity sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ== "@types/flat-cache@^2.0.0": version "2.0.0" - resolved "https://registry.npmjs.org/@types/flat-cache/-/flat-cache-2.0.0.tgz" + resolved "https://registry.yarnpkg.com/@types/flat-cache/-/flat-cache-2.0.0.tgz#64e5d3b426c392b603a208a55bdcc7d920ce6e57" integrity sha512-fHeEsm9hvmZ+QHpw6Fkvf19KIhuqnYLU6vtWLjd5BsMd/qVi7iTkMioDZl0mQmfNRA1A6NwvhrSRNr9hGYZGww== "@types/graphlib@^2", "@types/graphlib@^2.1.7": version "2.1.7" - resolved "https://registry.npmjs.org/@types/graphlib/-/graphlib-2.1.7.tgz" + resolved "https://registry.yarnpkg.com/@types/graphlib/-/graphlib-2.1.7.tgz#e6a47a4f43511f5bad30058a669ce5ce93bfd823" integrity sha512-K7T1n6U2HbTYu+SFHlBjz/RH74OA2D/zF1qlzn8uXbvB4uRg7knOM85ugS2bbXI1TXMh7rLqk4OVRwIwEBaixg== "@types/http-cache-semantics@*": version "4.0.0" - resolved "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.0.tgz" + resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.0.tgz#9140779736aa2655635ee756e2467d787cfe8a2a" integrity sha512-c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A== "@types/js-yaml@^3.12.1": version "3.12.2" - resolved "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.12.2.tgz" + resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.12.2.tgz#a35a1809c33a68200fb6403d1ad708363c56470a" integrity sha512-0CFu/g4mDSNkodVwWijdlr8jH7RoplRWNgovjFLEZeT+QEbbZXjBmCe3HwaWheAlCbHwomTwzZoSedeOycABug== "@types/keyv@*": version "3.1.1" - resolved "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.1.tgz" + resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.1.tgz#e45a45324fca9dab716ab1230ee249c9fb52cfa7" integrity sha512-MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw== dependencies: "@types/node" "*" "@types/lodash.chunk@^4.2.6": version "4.2.6" - resolved "https://registry.npmjs.org/@types/lodash.chunk/-/lodash.chunk-4.2.6.tgz" + resolved "https://registry.yarnpkg.com/@types/lodash.chunk/-/lodash.chunk-4.2.6.tgz#9d35f05360b0298715d7f3d9efb34dd4f77e5d2a" integrity sha512-SPlusB7jxXyGcTXYcUdWr7WmhArO/rmTq54VN88iKMxGUhyg79I4Q8n4riGn3kjaTjOJrVlHhxgX/d7woak5BQ== dependencies: "@types/lodash" "*" "@types/lodash.omit@^4.5.6": version "4.5.6" - resolved "https://registry.npmjs.org/@types/lodash.omit/-/lodash.omit-4.5.6.tgz" + resolved "https://registry.yarnpkg.com/@types/lodash.omit/-/lodash.omit-4.5.6.tgz#f2a9518259e481a48ff7ec423420fa8fd58933e2" integrity sha512-KXPpOSNX2h0DAG2w7ajpk7TXvWF28ZHs5nJhOJyP0BQHkehgr948RVsToItMme6oi0XJkp19CbuNXkIX8FiBlQ== dependencies: "@types/lodash" "*" "@types/lodash.union@^4.6.6": version "4.6.6" - resolved "https://registry.npmjs.org/@types/lodash.union/-/lodash.union-4.6.6.tgz" + resolved "https://registry.yarnpkg.com/@types/lodash.union/-/lodash.union-4.6.6.tgz#2f77f2088326ed147819e9e384182b99aae8d4b0" integrity sha512-Wu0ZEVNcyCz8eAn6TlUbYWZoGbH9E+iOHxAZbwUoCEXdUiy6qpcz5o44mMXViM4vlPLLCPlkAubEP1gokoSZaw== dependencies: "@types/lodash" "*" "@types/lodash@*": version "4.14.168" - resolved "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.168.tgz" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.168.tgz#fe24632e79b7ade3f132891afff86caa5e5ce008" integrity sha512-oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q== "@types/micromatch@^4.0.1": version "4.0.1" - resolved "https://registry.npmjs.org/@types/micromatch/-/micromatch-4.0.1.tgz" + resolved "https://registry.yarnpkg.com/@types/micromatch/-/micromatch-4.0.1.tgz#9381449dd659fc3823fd2a4190ceacc985083bc7" integrity sha512-my6fLBvpY70KattTNzYOK6KU1oR1+UCz9ug/JbcF5UrEmeCt9P7DV2t7L8+t18mMPINqGQCE4O8PLOPbI84gxw== dependencies: "@types/braces" "*" "@types/node@*": version "13.7.4" - resolved "https://registry.npmjs.org/@types/node/-/node-13.7.4.tgz" + resolved "https://registry.yarnpkg.com/@types/node/-/node-13.7.4.tgz#76c3cb3a12909510f52e5dc04a6298cdf9504ffd" integrity sha512-oVeL12C6gQS/GAExndigSaLxTrKpQPxewx9bOcwfvJiJge4rr7wNaph4J+ns5hrmIV2as5qxqN8YKthn9qh0jw== "@types/parse-json@^4.0.0": @@ -519,19 +504,19 @@ "@types/responselike@*", "@types/responselike@^1.0.0": version "1.0.0" - resolved "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz" + resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29" integrity sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA== dependencies: "@types/node" "*" "@types/sarif@^2.1.3": version "2.1.3" - resolved "https://registry.npmjs.org/@types/sarif/-/sarif-2.1.3.tgz" + resolved "https://registry.yarnpkg.com/@types/sarif/-/sarif-2.1.3.tgz#1f9c16033f1461536ac014284920350109614c02" integrity sha512-zf+EoIplTkQW2TV2mwtJtlI0g540Z3Rs9tX9JqRAtyjnDCqkP+eMTgWCj3PGNbQpi+WXAjvC3Ou/dvvX2sLK4w== "@types/uuid@^8.3.0": version "8.3.0" - resolved "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.0.tgz" + resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.0.tgz#215c231dff736d5ba92410e6d602050cce7e273f" integrity sha512-eQ9qFW/fhfGJF8WKHGEHZEyVWfZxrT+6CLIJGBcZPfxUh/+BnEj+UCGYMlr9qZuX/2AltsvwrGqp0LhEW8D0zQ== "@vue/component-compiler-utils@^3.0.0": @@ -1993,9 +1978,9 @@ ecc-jsbn@~0.1.1: jsbn "~0.1.0" safer-buffer "^2.1.0" -editorjs-undo@^0.1.6: +editorjs-undo@0.1.6: version "0.1.6" - resolved "https://registry.npmjs.org/editorjs-undo/-/editorjs-undo-0.1.6.tgz" + resolved "https://registry.yarnpkg.com/editorjs-undo/-/editorjs-undo-0.1.6.tgz#823349a1e9a78d8bc68ba8570a2b854063bc804a" integrity sha512-zVHPnBf2mcI8hWT9Eu8H3bGDEcMj4gppXbQjJW11Aa8Kdy2SVBGhM6fS59OUlBsm8iHWLxuoG2NUIfy9Rd30sw== ee-first@1.1.1: @@ -6111,7 +6096,7 @@ snyk-cpp-plugin@2.2.1: snyk-docker-plugin@4.19.3: version "4.19.3" - resolved "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.19.3.tgz" + resolved "https://registry.yarnpkg.com/snyk-docker-plugin/-/snyk-docker-plugin-4.19.3.tgz#14569f25c52a3fc71a20f80f5beac4ccdc326c11" integrity sha512-5WkXyT7uY5NrTOvEqxeMqb6dDcskT3c/gbHUTOyPuvE6tMut+OOYK8RRXbwZFeLzpS8asq4e1R7U7syYG3VXwg== dependencies: "@snyk/dep-graph" "^1.21.0" @@ -6134,7 +6119,7 @@ snyk-docker-plugin@4.19.3: snyk-go-parser@1.4.1: version "1.4.1" - resolved "https://registry.npmjs.org/snyk-go-parser/-/snyk-go-parser-1.4.1.tgz" + resolved "https://registry.yarnpkg.com/snyk-go-parser/-/snyk-go-parser-1.4.1.tgz#df16a5fbd7a517ee757268ef081abc33506c8857" integrity sha512-StU3uHB85VMEkcgXta63M0Fgd+9cs5sMCjQXTBoYTdE4dxarPn7U67yCuwkRRdZdny1ZXtzfY8LKns9i0+dy9w== dependencies: toml "^3.0.0" @@ -6142,7 +6127,7 @@ snyk-go-parser@1.4.1: snyk-go-plugin@1.17.0: version "1.17.0" - resolved "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.17.0.tgz" + resolved "https://registry.yarnpkg.com/snyk-go-plugin/-/snyk-go-plugin-1.17.0.tgz#56d0c92d7def29ba4c3c2030c5830093e3b0dd26" integrity sha512-1jAYPRgMapO2BYL+HWsUq5gsAiDGmI0Pn7omc0lk24tcUOMhUB+1hb0u9WBMNzHvXBjevBkjOctjpnt2hMKN6Q== dependencies: "@snyk/dep-graph" "^1.23.1" @@ -6154,7 +6139,7 @@ snyk-go-plugin@1.17.0: snyk-gradle-plugin@3.14.0: version "3.14.0" - resolved "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.14.0.tgz" + resolved "https://registry.yarnpkg.com/snyk-gradle-plugin/-/snyk-gradle-plugin-3.14.0.tgz#26c9833c97ef50e83b022b2e3077a9056f8674e1" integrity sha512-2A8ifM91TyzSx/U2fYvHXbaCRVsEx60hGFQjbSH9Hl9AokxEzMi2qti7wsObs1jUX2m198D1mdXu4k/Y1jWxXg== dependencies: "@snyk/cli-interface" "2.11.0" @@ -6168,7 +6153,7 @@ snyk-gradle-plugin@3.14.0: snyk-module@3.1.0, snyk-module@^3.0.0, snyk-module@^3.1.0: version "3.1.0" - resolved "https://registry.npmjs.org/snyk-module/-/snyk-module-3.1.0.tgz" + resolved "https://registry.yarnpkg.com/snyk-module/-/snyk-module-3.1.0.tgz#3e088ff473ddf0d4e253a46ea6749d76d8e6e7ba" integrity sha512-HHuOYEAACpUpkFgU8HT57mmxmonaJ4O3YADoSkVhnhkmJ+AowqZyJOau703dYHNrq2DvQ7qYw81H7yyxS1Nfjw== dependencies: debug "^4.1.1" @@ -6176,7 +6161,7 @@ snyk-module@3.1.0, snyk-module@^3.0.0, snyk-module@^3.1.0: snyk-mvn-plugin@2.25.3: version "2.25.3" - resolved "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.25.3.tgz" + resolved "https://registry.yarnpkg.com/snyk-mvn-plugin/-/snyk-mvn-plugin-2.25.3.tgz#fb7f6fa1d565b9f07c032e8b34e6308c310b2a27" integrity sha512-JAxOThX51JDbgMMjp3gQDVi07G9VgTYSF06QC7f5LNA0zoXNr743e2rm78RGw5bqE3JRjZxEghiLHPPuvS5DDg== dependencies: "@snyk/cli-interface" "2.11.0" @@ -6190,7 +6175,7 @@ snyk-mvn-plugin@2.25.3: snyk-nodejs-lockfile-parser@1.30.2: version "1.30.2" - resolved "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.30.2.tgz" + resolved "https://registry.yarnpkg.com/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.30.2.tgz#8dbb64c42382aeaf4488c36e48c1e48eb75a1584" integrity sha512-wI3VXVYO/ok0uaQm5i+Koo4rKBNilYC/QRIQFlyGbZXf+WBdRcTBKVDfTy8uNfUhMRSGzd84lNclMnetU9Y+vw== dependencies: "@snyk/graphlib" "2.1.9-patch.3" @@ -6210,7 +6195,7 @@ snyk-nodejs-lockfile-parser@1.30.2: snyk-nodejs-lockfile-parser@1.31.1: version "1.31.1" - resolved "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.31.1.tgz" + resolved "https://registry.yarnpkg.com/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.31.1.tgz#badd9fbf8f58f0bd090e5378997cbe4548033664" integrity sha512-MU1V2zS5ziLGMUL6PXxPvJuZ281wvawjQQ1c8TW697Jjkhd8hPZcW4IzMu52ok0zsmQcVZh8sVniBEHIePCfLQ== dependencies: "@snyk/graphlib" "2.1.9-patch.3" @@ -6230,7 +6215,7 @@ snyk-nodejs-lockfile-parser@1.31.1: snyk-nuget-plugin@1.21.0: version "1.21.0" - resolved "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.21.0.tgz" + resolved "https://registry.yarnpkg.com/snyk-nuget-plugin/-/snyk-nuget-plugin-1.21.0.tgz#d9d3976cf0b4572ae97c47f758f84fc43040216f" integrity sha512-c/JYF3sZzMN/lYz171zrEkVcPqDVcUTVgKIKHiL8nhhuFKxZQ1gzqOgk+lnfN31TLoTNQsZ3DhW/WY+4zEALvw== dependencies: debug "^4.1.1" @@ -6242,14 +6227,14 @@ snyk-nuget-plugin@1.21.0: snyk-paket-parser@1.6.0: version "1.6.0" - resolved "https://registry.npmjs.org/snyk-paket-parser/-/snyk-paket-parser-1.6.0.tgz" + resolved "https://registry.yarnpkg.com/snyk-paket-parser/-/snyk-paket-parser-1.6.0.tgz#f70c423b33d31484c8c4cae74bb7f5deb9bbc382" integrity sha512-6htFynjBe/nakclEHUZ1A3j5Eu32/0pNve5Qm4MFn3YQmJgj7UcAO8hdyK3QfzEY29/kAv/rkJQg+SKshn+N9Q== dependencies: tslib "^1.9.3" snyk-php-plugin@1.9.2: version "1.9.2" - resolved "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.9.2.tgz" + resolved "https://registry.yarnpkg.com/snyk-php-plugin/-/snyk-php-plugin-1.9.2.tgz#282ef733060aab49da23e1fb2d2dd1af8f71f7cd" integrity sha512-IQcdsQBqqXVRY5DatlI7ASy4flbhtU2V7cr4P2rK9rkFnVHO6LHcitwKXVZa9ocdOmpZDzk7U6iwHJkVFcR6OA== dependencies: "@snyk/cli-interface" "^2.9.1" @@ -6258,7 +6243,7 @@ snyk-php-plugin@1.9.2: snyk-poetry-lockfile-parser@^1.1.6: version "1.1.6" - resolved "https://registry.npmjs.org/snyk-poetry-lockfile-parser/-/snyk-poetry-lockfile-parser-1.1.6.tgz" + resolved "https://registry.yarnpkg.com/snyk-poetry-lockfile-parser/-/snyk-poetry-lockfile-parser-1.1.6.tgz#bab5a279c103cbcca8eb86ab87717b115592881e" integrity sha512-MoekbWOZPj9umfukjk2bd2o3eRj0OyO+58sxq9crMtHmTlze4h0/Uj4+fb0JFPBOtBO3c2zwbA+dvFQmpKoOTA== dependencies: "@snyk/cli-interface" "^2.9.2" @@ -6269,7 +6254,7 @@ snyk-poetry-lockfile-parser@^1.1.6: snyk-policy@1.19.0: version "1.19.0" - resolved "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.19.0.tgz" + resolved "https://registry.yarnpkg.com/snyk-policy/-/snyk-policy-1.19.0.tgz#0cbc442d9503970fb3afea938f57d57993a914ad" integrity sha512-XYjhOTRPFA7NfDUsH6uH1fbML2OgSFsqdUPbud7x01urNP9CHXgUgAD4NhKMi3dVQK+7IdYadWt0wrFWw4y+qg== dependencies: debug "^4.1.1" @@ -6284,7 +6269,7 @@ snyk-policy@1.19.0: snyk-python-plugin@1.19.7: version "1.19.7" - resolved "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.19.7.tgz" + resolved "https://registry.yarnpkg.com/snyk-python-plugin/-/snyk-python-plugin-1.19.7.tgz#d7e536694a481fd48e7d0cc8e7753c3f15a9c8be" integrity sha512-twAGoIgJVSLVzMkuT/n5l9ZDvhMbWH7De6flWiHQB/grthfl3vJDzLCxiTa+6H/IEEYNSv6F/nSrfNh9UbW5/A== dependencies: "@snyk/cli-interface" "^2.0.3" @@ -6293,7 +6278,7 @@ snyk-python-plugin@1.19.7: snyk-resolve-deps@4.7.2: version "4.7.2" - resolved "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-4.7.2.tgz" + resolved "https://registry.yarnpkg.com/snyk-resolve-deps/-/snyk-resolve-deps-4.7.2.tgz#11e7051110dadd8756819594bb30e6b88777a8b4" integrity sha512-Bmtr7QdRL2b3Js+mPDmvXbkprOpzO8aUFXqR0nJKAOlUVQqZ84yiuT0n/mssEiJJ0vP+k0kZvTeiTwgio4KZRg== dependencies: ansicolors "^0.3.2" @@ -6314,7 +6299,7 @@ snyk-resolve-deps@4.7.2: snyk-resolve@1.1.0, snyk-resolve@^1.1.0: version "1.1.0" - resolved "https://registry.npmjs.org/snyk-resolve/-/snyk-resolve-1.1.0.tgz" + resolved "https://registry.yarnpkg.com/snyk-resolve/-/snyk-resolve-1.1.0.tgz#52740cb01ba477851086855f9857b3a44296ee0e" integrity sha512-OZMF8I8TOu0S58Z/OS9mr8jkEzGAPByCsAkrWlcmZgPaE0RsxVKVIFPhbMNy/JlYswgGDYYIEsNw+e0j1FnTrw== dependencies: debug "^4.1.1" @@ -6322,7 +6307,7 @@ snyk-resolve@1.1.0, snyk-resolve@^1.1.0: snyk-resolve@^1.0.0: version "1.0.1" - resolved "https://registry.npmjs.org/snyk-resolve/-/snyk-resolve-1.0.1.tgz" + resolved "https://registry.yarnpkg.com/snyk-resolve/-/snyk-resolve-1.0.1.tgz#eaa4a275cf7e2b579f18da5b188fe601b8eed9ab" integrity sha512-7+i+LLhtBo1Pkth01xv+RYJU8a67zmJ8WFFPvSxyCjdlKIcsps4hPQFebhz+0gC5rMemlaeIV6cqwqUf9PEDpw== dependencies: debug "^3.1.0" @@ -6330,7 +6315,7 @@ snyk-resolve@^1.0.0: snyk-sbt-plugin@2.11.0: version "2.11.0" - resolved "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-2.11.0.tgz" + resolved "https://registry.yarnpkg.com/snyk-sbt-plugin/-/snyk-sbt-plugin-2.11.0.tgz#f5469dcf5589e34575fc901e2064475582cc3e48" integrity sha512-wUqHLAa3MzV6sVO+05MnV+lwc+T6o87FZZaY+43tQPytBI2Wq23O3j4POREM4fa2iFfiQJoEYD6c7xmhiEUsSA== dependencies: debug "^4.1.1" @@ -6341,14 +6326,14 @@ snyk-sbt-plugin@2.11.0: snyk-tree@^1.0.0: version "1.0.0" - resolved "https://registry.npmjs.org/snyk-tree/-/snyk-tree-1.0.0.tgz" + resolved "https://registry.yarnpkg.com/snyk-tree/-/snyk-tree-1.0.0.tgz#0fb73176dbf32e782f19100294160448f9111cc8" integrity sha1-D7cxdtvzLngvGRAClBYESPkRHMg= dependencies: archy "^1.0.0" snyk-try-require@1.3.1, snyk-try-require@^1.1.1: version "1.3.1" - resolved "https://registry.npmjs.org/snyk-try-require/-/snyk-try-require-1.3.1.tgz" + resolved "https://registry.yarnpkg.com/snyk-try-require/-/snyk-try-require-1.3.1.tgz#6e026f92e64af7fcccea1ee53d524841e418a212" integrity sha1-bgJvkuZK9/zM6h7lPVJIQeQYohI= dependencies: debug "^3.1.0" @@ -6358,7 +6343,7 @@ snyk-try-require@1.3.1, snyk-try-require@^1.1.1: snyk-try-require@^2.0.0: version "2.0.1" - resolved "https://registry.npmjs.org/snyk-try-require/-/snyk-try-require-2.0.1.tgz" + resolved "https://registry.yarnpkg.com/snyk-try-require/-/snyk-try-require-2.0.1.tgz#076ae9bc505d64d28389452ce19fcac28f26655a" integrity sha512-VCOfFIvqLMXgCXEdooQgu3A40XYIFBnj0X8Y01RJ5iAbu08b4WKGN/uAKaRVF30dABS4EcjsalmCO+YlKUPEIA== dependencies: debug "^4.1.1" @@ -6367,7 +6352,7 @@ snyk-try-require@^2.0.0: snyk@^1.518.0: version "1.520.0" - resolved "https://registry.npmjs.org/snyk/-/snyk-1.520.0.tgz" + resolved "https://registry.yarnpkg.com/snyk/-/snyk-1.520.0.tgz#2cc0a9981a47f1140379c48e9a1116c68328ccd2" integrity sha512-+NSZDb1sbG+AxzK//GLAKHF0oyPyDlUzQgwy8tyet4tiUsnDKKEruCsX4R9c0outy5qfAExKG77aZego3N9p/Q== dependencies: "@open-policy-agent/opa-wasm" "^1.2.0" @@ -6701,7 +6686,7 @@ string-width@^4.2.0: string.prototype.trimend@^1.0.0: version "1.0.1" - resolved "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913" integrity sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g== dependencies: define-properties "^1.1.3" @@ -6709,7 +6694,7 @@ string.prototype.trimend@^1.0.0: string.prototype.trimleft@^2.1.1: version "2.1.2" - resolved "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz" + resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz#4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc" integrity sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw== dependencies: define-properties "^1.1.3" @@ -6718,7 +6703,7 @@ string.prototype.trimleft@^2.1.1: string.prototype.trimright@^2.1.1: version "2.1.2" - resolved "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz" + resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz#c76f1cef30f21bbad8afeb8db1511496cfb0f2a3" integrity sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg== dependencies: define-properties "^1.1.3" @@ -6727,7 +6712,7 @@ string.prototype.trimright@^2.1.1: string.prototype.trimstart@^1.0.0: version "1.0.1" - resolved "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz#14af6d9f34b053f7cfc89b72f8f2ee14b9039a54" integrity sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw== dependencies: define-properties "^1.1.3" @@ -6749,54 +6734,54 @@ string_decoder@~1.1.1: strip-ansi@6.0.0, strip-ansi@^6.0.0: version "6.0.0" - resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== dependencies: ansi-regex "^5.0.0" strip-ansi@^3.0.0, strip-ansi@^3.0.1: version "3.0.1" - resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= dependencies: ansi-regex "^2.0.0" strip-ansi@^4.0.0: version "4.0.0" - resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= dependencies: ansi-regex "^3.0.0" strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: version "5.2.0" - resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== dependencies: ansi-regex "^4.1.0" strip-bom@^2.0.0: version "2.0.0" - resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz" + resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e" integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4= dependencies: is-utf8 "^0.2.0" strip-eof@^1.0.0: version "1.0.0" - resolved "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz" + resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= strip-indent@^1.0.1: version "1.0.1" - resolved "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz" + resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2" integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI= dependencies: get-stdin "^4.0.1" strip-json-comments@~2.0.1: version "2.0.1" - resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= stylehacks@^5.0.1: @@ -6823,7 +6808,7 @@ stylus@^0.54.5, stylus@^0.x: superagent@^3.8.2: version "3.8.3" - resolved "https://registry.npmjs.org/superagent/-/superagent-3.8.3.tgz" + resolved "https://registry.yarnpkg.com/superagent/-/superagent-3.8.3.tgz#460ea0dbdb7d5b11bc4f78deba565f86a178e128" integrity sha512-GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA== dependencies: component-emitter "^1.2.0" @@ -6839,33 +6824,33 @@ superagent@^3.8.2: supports-color@^2.0.0: version "2.0.0" - resolved "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= supports-color@^3.2.3: version "3.2.3" - resolved "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6" integrity sha1-ZawFBLOVQXHYpklGsq48u4pfVPY= dependencies: has-flag "^1.0.0" supports-color@^5.3.0, supports-color@^5.4.0: version "5.5.0" - resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== dependencies: has-flag "^3.0.0" supports-color@^6.1.0: version "6.1.0" - resolved "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3" integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ== dependencies: has-flag "^3.0.0" supports-color@^7.1.0: version "7.1.0" - resolved "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1" integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g== dependencies: has-flag "^4.0.0" @@ -6885,7 +6870,7 @@ svgo@^2.3.0: tar-stream@^2.1.0: version "2.1.0" - resolved "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.0.tgz" + resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.0.tgz#d1aaa3661f05b38b5acc9b7020efdca5179a2cc3" integrity sha512-+DAn4Nb4+gz6WZigRzKEZl1QuJVOLtAwwF+WUxy1fJ6X63CaGaUAxJRD2KEn1OMfcbCjySTYpNC6WmfQoIEOdw== dependencies: bl "^3.0.0" @@ -6896,7 +6881,7 @@ tar-stream@^2.1.0: tar-stream@^2.1.2: version "2.1.3" - resolved "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.3.tgz" + resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.3.tgz#1e2022559221b7866161660f118255e20fa79e41" integrity sha512-Z9yri56Dih8IaK8gncVPx4Wqt86NDmQTSh49XLZgjWpGZL9GK9HKParS2scqHCC4w6X9Gh2jwaU45V47XTKwVA== dependencies: bl "^4.0.1" @@ -6907,7 +6892,7 @@ tar-stream@^2.1.2: tar@^2.0.0: version "2.2.2" - resolved "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz" + resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40" integrity sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA== dependencies: block-stream "*" @@ -6916,7 +6901,7 @@ tar@^2.0.0: tar@^6.1.0: version "6.1.0" - resolved "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.0.tgz#d1724e9bcc04b977b18d5c573b333a2207229a83" integrity sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA== dependencies: chownr "^2.0.0" @@ -6928,17 +6913,17 @@ tar@^6.1.0: temp-dir@^1.0.0: version "1.0.0" - resolved "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz" + resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d" integrity sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0= temp-dir@^2.0.0: version "2.0.0" - resolved "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz" + resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-2.0.0.tgz#bde92b05bdfeb1516e804c9c00ad45177f31321e" integrity sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg== tempfile@^2.0.0: version "2.0.0" - resolved "https://registry.npmjs.org/tempfile/-/tempfile-2.0.0.tgz" + resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-2.0.0.tgz#6b0446856a9b1114d1856ffcbe509cccb0977265" integrity sha1-awRGhWqbERTRhW/8vlCczLCXcmU= dependencies: temp-dir "^1.0.0" @@ -6946,19 +6931,19 @@ tempfile@^2.0.0: term-size@^2.1.0: version "2.2.0" - resolved "https://registry.npmjs.org/term-size/-/term-size-2.2.0.tgz" + resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.2.0.tgz#1f16adedfe9bdc18800e1776821734086fcc6753" integrity sha512-a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw== then-fs@^2.0.0: version "2.0.0" - resolved "https://registry.npmjs.org/then-fs/-/then-fs-2.0.0.tgz" + resolved "https://registry.yarnpkg.com/then-fs/-/then-fs-2.0.0.tgz#72f792dd9d31705a91ae19ebfcf8b3f968c81da2" integrity sha1-cveS3Z0xcFqRrhnr/Piz+WjIHaI= dependencies: promise ">=3.2 <8" through2@^2.0.3: version "2.0.5" - resolved "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz" + resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== dependencies: readable-stream "~2.3.6" @@ -6966,38 +6951,38 @@ through2@^2.0.3: through@^2.3.4, through@^2.3.6: version "2.3.8" - resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz" + resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= timsort@^0.3.0: version "0.3.0" - resolved "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz" + resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= tmp@0.0.33, tmp@^0.0.33: version "0.0.33" - resolved "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw== dependencies: os-tmpdir "~1.0.2" tmp@0.2.1, tmp@^0.2.1: version "0.2.1" - resolved "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ== dependencies: rimraf "^3.0.0" tmp@^0.1.0: version "0.1.0" - resolved "https://registry.npmjs.org/tmp/-/tmp-0.1.0.tgz" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.1.0.tgz#ee434a4e22543082e294ba6201dcc6eafefa2877" integrity sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw== dependencies: rimraf "^2.6.3" to-array@0.1.4: version "0.1.4" - resolved "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz" + resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890" integrity sha1-F+bBH3PdTz10zaek/zI46a2b+JA= to-fast-properties@^1.0.3: @@ -7007,26 +6992,26 @@ to-fast-properties@^1.0.3: to-object-path@^0.3.0: version "0.3.0" - resolved "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz" + resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68= dependencies: kind-of "^3.0.2" to-readable-stream@^1.0.0: version "1.0.0" - resolved "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz" + resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771" integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q== to-regex-range@^5.0.1: version "5.0.1" - resolved "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== dependencies: is-number "^7.0.0" toidentifier@1.0.0: version "1.0.0" - resolved "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz" + resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== token-stream@0.0.1: @@ -7036,19 +7021,19 @@ token-stream@0.0.1: toml@^3.0.0: version "3.0.0" - resolved "https://registry.npmjs.org/toml/-/toml-3.0.0.tgz" + resolved "https://registry.yarnpkg.com/toml/-/toml-3.0.0.tgz#342160f1af1904ec9d204d03a5d61222d762c5ee" integrity sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w== touch@^3.1.0: version "3.1.0" - resolved "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz" + resolved "https://registry.yarnpkg.com/touch/-/touch-3.1.0.tgz#fe365f5f75ec9ed4e56825e0bb76d24ab74af83b" integrity sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA== dependencies: nopt "~1.0.10" tough-cookie@~2.4.3: version "2.4.3" - resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781" integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ== dependencies: psl "^1.1.24" @@ -7056,7 +7041,7 @@ tough-cookie@~2.4.3: tough-cookie@~2.5.0: version "2.5.0" - resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== dependencies: psl "^1.1.28" @@ -7064,12 +7049,12 @@ tough-cookie@~2.5.0: tree-kill@^1.2.2: version "1.2.2" - resolved "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz" + resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc" integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A== trim-newlines@^1.0.0: version "1.0.0" - resolved "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz" + resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613" integrity sha1-WIeWa7WCpFA6QetST301ARgVphM= "true-case-path@^1.0.2": From e9778bdb594c9f72050c7d7ebf82d89b7e5eb176 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 23 Jun 2021 19:48:02 +0530 Subject: [PATCH 046/306] fix: sidebar control alignment fix for firefox --- frappe/public/scss/desk/wiki.scss | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/frappe/public/scss/desk/wiki.scss b/frappe/public/scss/desk/wiki.scss index cf452d65c5..517e2a8182 100644 --- a/frappe/public/scss/desk/wiki.scss +++ b/frappe/public/scss/desk/wiki.scss @@ -34,7 +34,6 @@ padding: 0px; .sidebar-item-control { - margin-right: 8px; > * { align-self: center; @@ -53,8 +52,7 @@ } .drop-icon { - padding: 10px 12px 10px 0px; - margin-right: -8px; + padding: 10px 12px 10px 2px; } .sidebar-info { @@ -98,11 +96,17 @@ .delete-page { display: inline-block; + margin-right: 8px; } .sidebar-info { display: inline-block; } + + .drop-icon { + padding: 10px 8px 10px 2px; + margin-left: -4px; + } } .block-click { From e472baa381945af61bf4bab6e0b57703e2ab667b Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 23 Jun 2021 19:48:51 +0530 Subject: [PATCH 047/306] fix: Page load optimization --- frappe/public/js/frappe/views/wiki.js | 47 ++++++++++++++------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index 8ffa6f98c1..fa3e43b656 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -177,6 +177,8 @@ frappe.views.Wiki = class Wiki { wiki: true }).then(data => { this.page_data = data; + this.pages[page] && delete this.pages[page]; + this.pages[page] = data; if (!this.page_data || Object.keys(this.page_data).length === 0) return; return frappe.dashboard_utils.get_dashboard_settings().then(settings => { @@ -206,10 +208,6 @@ frappe.views.Wiki = class Wiki { } show_page(page) { - if (this.current_page_name && this.pages[this.current_page_name]) { - this.pages[this.current_page_name].hide(); - } - if (this.sidebar_items && this.sidebar_items[this.current_page_name]) { this.sidebar_items[this.current_page_name][0].firstElementChild.classList.remove("selected"); this.sidebar_items[page][0].firstElementChild.classList.add("selected"); @@ -231,29 +229,33 @@ frappe.views.Wiki = class Wiki { `).appendTo(this.body); } - this.setup_actions(page); - this.prepare_editorjs(page); - } - - prepare_editorjs(page) { if (this.all_pages) { let this_page = this.all_pages.filter(p => p.title == page)[0]; this.setup_actions(page); this.content = this_page && JSON.parse(this_page.content); - this.get_data(page).then(() => { - if (this.editor) { - this.editor.isReady.then(() => { - this.editor.configuration.tools.chart.config.page_data = this.page_data; - this.editor.configuration.tools.shortcut.config.page_data = this.page_data; - this.editor.configuration.tools.card.config.page_data = this.page_data; - this.editor.render({ - blocks: this.content || [] - }); - }); - } else { - this.initialize_editorjs(this.content); - } + if (this.pages[page]) { + this.page_data = this.pages[page]; + this.prepare_editorjs(); + } else { + this.get_data(page).then(() => { + this.prepare_editorjs(); + }); + } + } + } + + prepare_editorjs() { + if (this.editor) { + this.editor.isReady.then(() => { + this.editor.configuration.tools.chart.config.page_data = this.page_data; + this.editor.configuration.tools.shortcut.config.page_data = this.page_data; + this.editor.configuration.tools.card.config.page_data = this.page_data; + this.editor.render({ + blocks: this.content || [] + }); }); + } else { + this.initialize_editorjs(this.content); } } @@ -568,6 +570,7 @@ frappe.views.Wiki = class Wiki { frappe.dom.unfreeze(); if (res.message) { frappe.show_alert({ message: __("Page Saved Successfully"), indicator: "green" }); + me.pages[res.message] && delete me.pages[res.message]; me.title = ''; me.parent = ''; me.public = false; From 61deecbd7c1267d170206969b60e326e217ef6fa Mon Sep 17 00:00:00 2001 From: Mohammad Hasnain Mohsin Rajan Date: Mon, 28 Jun 2021 18:30:55 +0530 Subject: [PATCH 048/306] chore: fix tests --- frappe/tests/test_formatter.py | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/tests/test_formatter.py b/frappe/tests/test_formatter.py index 636f3d970d..a837573dbc 100644 --- a/frappe/tests/test_formatter.py +++ b/frappe/tests/test_formatter.py @@ -37,6 +37,7 @@ class TestFormatter(unittest.TestCase): frappe.db.set_default("currency", 'INR') # if currency field is not passed then default currency should be used. + print(doc.currency) self.assertEqual(format(100000, df, doc, format="#,###.##"), '₹ 100,000.00') doc.currency = 'USD' From 4b0c67f57cd68ec591ecf100eb2ec7de77b025ba Mon Sep 17 00:00:00 2001 From: Mohammad Hasnain Mohsin Rajan Date: Mon, 28 Jun 2021 18:43:03 +0530 Subject: [PATCH 049/306] chore: debug tests --- frappe/tests/test_formatter.py | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/tests/test_formatter.py b/frappe/tests/test_formatter.py index a837573dbc..5ebfb3ee6d 100644 --- a/frappe/tests/test_formatter.py +++ b/frappe/tests/test_formatter.py @@ -37,6 +37,7 @@ class TestFormatter(unittest.TestCase): frappe.db.set_default("currency", 'INR') # if currency field is not passed then default currency should be used. + print("doc.currency") print(doc.currency) self.assertEqual(format(100000, df, doc, format="#,###.##"), '₹ 100,000.00') From 64e37d6ab9ba7b9d3b9804d34b65a280b0b2a74b Mon Sep 17 00:00:00 2001 From: Mohammad Hasnain Mohsin Rajan Date: Tue, 29 Jun 2021 10:16:32 +0530 Subject: [PATCH 050/306] chore: debug tests --- frappe/tests/test_formatter.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frappe/tests/test_formatter.py b/frappe/tests/test_formatter.py index 5ebfb3ee6d..cd7b8add9d 100644 --- a/frappe/tests/test_formatter.py +++ b/frappe/tests/test_formatter.py @@ -39,6 +39,9 @@ class TestFormatter(unittest.TestCase): # if currency field is not passed then default currency should be used. print("doc.currency") print(doc.currency) + print("frappe.db.get_default('currency')") + print(frappe.db.get_default("currency")) + self.assertEqual(format(100000, df, doc, format="#,###.##"), '₹ 100,000.00') doc.currency = 'USD' From 82c1c56671032e4528876e091b03d53fd150410f Mon Sep 17 00:00:00 2001 From: GangaManoj Date: Fri, 2 Jul 2021 14:37:09 +0530 Subject: [PATCH 051/306] fix: Check for key, not attribute, for dictionary --- frappe/desk/doctype/workspace/workspace.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/desk/doctype/workspace/workspace.py b/frappe/desk/doctype/workspace/workspace.py index 0b5babc8d9..5bf0f472e8 100644 --- a/frappe/desk/doctype/workspace/workspace.py +++ b/frappe/desk/doctype/workspace/workspace.py @@ -55,7 +55,7 @@ class Workspace(Document): for link in self.links: link = link.as_dict() if link.type == "Card Break": - if card_links and (not current_card.only_for or current_card.only_for == frappe.get_system_settings('country')): + if card_links and (not current_card['only_for'] or current_card['only_for'] == frappe.get_system_settings('country')): current_card['links'] = card_links cards.append(current_card) From afe1dbe0f8c917cd8288e4521432879ef4d8fec6 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 6 Jul 2021 22:05:37 +0530 Subject: [PATCH 052/306] fix: Workspace 2.0 --- frappe/boot.py | 4 +- frappe/desk/desktop.py | 120 +-- frappe/desk/doctype/internal_wiki/__init__.py | 0 .../doctype/internal_wiki/internal_wiki.js | 8 - .../doctype/internal_wiki/internal_wiki.json | 52 -- .../doctype/internal_wiki/internal_wiki.py | 111 --- .../internal_wiki/test_internal_wiki.py | 8 - .../doctype/internal_wiki_page/__init__.py | 0 .../internal_wiki_page/internal_wiki_page.js | 8 - .../internal_wiki_page.json | 55 -- .../internal_wiki_page/internal_wiki_page.py | 35 - .../test_internal_wiki_page.py | 10 - frappe/desk/doctype/workspace/workspace.json | 39 +- frappe/desk/doctype/workspace/workspace.py | 101 ++ frappe/desk/page/wiki/__init__.py | 0 frappe/desk/page/wiki/wiki.js | 15 - frappe/desk/page/wiki/wiki.json | 19 - frappe/patches.txt | 1 + frappe/patches/v13_0/update_workspace.py | 49 + frappe/public/build.json | 4 +- frappe/public/js/desk.bundle.js | 4 +- frappe/public/js/frappe/desk.js | 2 +- frappe/public/js/frappe/router.js | 17 +- frappe/public/js/frappe/views/wiki.js | 594 ------------ .../workspace/blocks}/block.js | 2 +- .../workspace/blocks}/card.js | 0 .../workspace/blocks}/chart.js | 0 .../workspace/blocks}/header.js | 0 .../js/frappe/views/workspace/blocks/index.js | 25 + .../workspace/blocks}/paragraph.js | 0 .../workspace/blocks}/shortcut.js | 0 .../workspace/blocks}/spacer.js | 0 .../workspace/blocks}/spacing_tune.js | 0 .../js/frappe/views/workspace/workspace.js | 862 ++++++++++++------ frappe/public/js/frappe/wiki_blocks/blocks.js | 25 - frappe/public/scss/desk/desktop.scss | 249 +++++ frappe/public/scss/desk/index.scss | 1 - frappe/public/scss/desk/wiki.scss | 274 ------ 38 files changed, 1058 insertions(+), 1636 deletions(-) delete mode 100644 frappe/desk/doctype/internal_wiki/__init__.py delete mode 100644 frappe/desk/doctype/internal_wiki/internal_wiki.js delete mode 100644 frappe/desk/doctype/internal_wiki/internal_wiki.json delete mode 100644 frappe/desk/doctype/internal_wiki/internal_wiki.py delete mode 100644 frappe/desk/doctype/internal_wiki/test_internal_wiki.py delete mode 100644 frappe/desk/doctype/internal_wiki_page/__init__.py delete mode 100644 frappe/desk/doctype/internal_wiki_page/internal_wiki_page.js delete mode 100644 frappe/desk/doctype/internal_wiki_page/internal_wiki_page.json delete mode 100644 frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py delete mode 100644 frappe/desk/doctype/internal_wiki_page/test_internal_wiki_page.py delete mode 100644 frappe/desk/page/wiki/__init__.py delete mode 100644 frappe/desk/page/wiki/wiki.js delete mode 100644 frappe/desk/page/wiki/wiki.json create mode 100644 frappe/patches/v13_0/update_workspace.py delete mode 100644 frappe/public/js/frappe/views/wiki.js rename frappe/public/js/frappe/{wiki_blocks => views/workspace/blocks}/block.js (98%) rename frappe/public/js/frappe/{wiki_blocks => views/workspace/blocks}/card.js (100%) rename frappe/public/js/frappe/{wiki_blocks => views/workspace/blocks}/chart.js (100%) rename frappe/public/js/frappe/{wiki_blocks => views/workspace/blocks}/header.js (100%) create mode 100644 frappe/public/js/frappe/views/workspace/blocks/index.js rename frappe/public/js/frappe/{wiki_blocks => views/workspace/blocks}/paragraph.js (100%) rename frappe/public/js/frappe/{wiki_blocks => views/workspace/blocks}/shortcut.js (100%) rename frappe/public/js/frappe/{wiki_blocks => views/workspace/blocks}/spacer.js (100%) rename frappe/public/js/frappe/{wiki_blocks => views/workspace/blocks}/spacing_tune.js (100%) delete mode 100644 frappe/public/js/frappe/wiki_blocks/blocks.js delete mode 100644 frappe/public/scss/desk/wiki.scss diff --git a/frappe/boot.py b/frappe/boot.py index 0589e32ac8..1bcdca6a65 100644 --- a/frappe/boot.py +++ b/frappe/boot.py @@ -105,8 +105,8 @@ def load_conf_settings(bootinfo): if key in conf: bootinfo[key] = conf.get(key) def load_desktop_data(bootinfo): - from frappe.desk.desktop import get_desk_sidebar_items - bootinfo.allowed_workspaces = get_desk_sidebar_items() + from frappe.desk.doctype.workspace.workspace import get_pages + bootinfo.allowed_workspaces = get_pages().get('pages') bootinfo.module_page_map = get_controller("Workspace").get_module_page_map() bootinfo.dashboards = frappe.get_all("Dashboard") diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index 8e044ac7bd..a0d325e104 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -4,7 +4,6 @@ import frappe import json -from typing import Dict, List from json import loads, dumps from frappe import _, DoesNotExistError, ValidationError, _dict from frappe.boot import get_allowed_pages, get_allowed_reports @@ -29,10 +28,10 @@ def handle_not_exist(fn): class Workspace: - def __init__(self, page_name, minimal=False, wiki=False) -> List[Dict]: - if isinstance(wiki, str): - wiki = json.loads(wiki) - self.page_name = page_name + def __init__(self, page, minimal=False): + self.page_name = page.get('name') + self.page_title = page.get('title') + self.public_page = page.get('public') self.extended_links = [] self.extended_charts = [] self.extended_shortcuts = [] @@ -40,10 +39,7 @@ class Workspace: self.user = frappe.get_user() self.allowed_modules = self.get_cached('user_allowed_modules', self.get_allowed_modules) - if wiki: - self.doc = self.get_wiki_page_for_user() - else: - self.doc = self.get_page_for_user() + self.doc = self.get_page_for_user() if self.doc.module and self.doc.module not in self.allowed_modules: raise frappe.PermissionError @@ -109,40 +105,18 @@ class Workspace: return self.user.allow_modules def get_page_for_user(self): - filters = { - 'extends': self.page_name, - 'for_user': frappe.session.user, - } - user_pages = frappe.get_all("Workspace", filters=filters, limit=1) - if user_pages: - return frappe.get_cached_doc("Workspace", user_pages[0]) - - filters = { - 'extends_another_page': 1, - 'extends': self.page_name, - 'is_default': 1 - } - default_page = frappe.get_all("Workspace", filters=filters, limit=1) - if default_page: - return frappe.get_cached_doc("Workspace", default_page[0]) - - self.get_pages_to_extend() - return frappe.get_cached_doc("Workspace", self.page_name) - - def get_wiki_page_for_user(self): - filters = { - 'wiki_label': self.page_name, - 'public': 1, - 'for_wiki': 1 - } - user_pages = frappe.get_all("Workspace", filters=filters, limit=1) - if user_pages: - return frappe.get_cached_doc("Workspace", user_pages[0]) + if self.public_page: + filters = { + 'label': self.page_name, + 'public': 1 + } + public_pages = frappe.get_all("Workspace", filters=filters, limit=1) + if public_pages: + return frappe.get_cached_doc("Workspace", public_pages[0]) filters = { - 'wiki_label': self.page_name, - 'for_user': frappe.session.user, - 'for_wiki': 1 + 'label': self.page_title + "-" + frappe.session.user, + 'for_user': frappe.session.user } user_pages = frappe.get_all("Workspace", filters=filters, limit=1) if user_pages: @@ -373,7 +347,7 @@ class Workspace: @frappe.whitelist() @frappe.read_only() -def get_desktop_page(page, wiki=False): +def get_desktop_page(page): """Applies permissions, customizations and returns the configruration for a page on desk. @@ -384,13 +358,7 @@ def get_desktop_page(page, wiki=False): dict: dictionary of cards, charts and shortcuts to be displayed on website """ try: - if wiki and not frappe.db.exists({ - 'doctype': 'Workspace', - 'wiki_label': page, - 'for_wiki': 1 - }): - return - wspace = Workspace(page, wiki=wiki) + wspace = Workspace(loads(page)) wspace.build_workspace() return { 'charts': wspace.charts, @@ -428,7 +396,7 @@ def get_desk_sidebar_items(): # Filter Page based on Permission for page in all_pages: try: - wspace = Workspace(page.get('name'), True) + wspace = Workspace(page.get('name')) if wspace.is_page_allowed(): pages.append(page) page['label'] = _(page.get('name')) @@ -511,42 +479,6 @@ def get_custom_workspace_for_user(page): doc.for_user = frappe.session.user return doc -def get_custom_wiki_for_user(page, public): - """Get custom page from workspace if exists or create one - - Args: - page (stirng): Page name - - Returns: - Object: Document object - """ - filters = { - 'wiki_label': page, - 'public': 1 - } - pages = frappe.get_list("Workspace", filters=filters) - if pages: - return frappe.get_doc("Workspace", pages[0]) - - filters = { - 'wiki_label': page, - 'for_user': frappe.session.user, - 'for_wiki': 1 - } - pages = frappe.get_list("Workspace", filters=filters) - if pages: - return frappe.get_doc("Workspace", pages[0]) - doc = frappe.new_doc("Workspace") - doc.wiki_label = page - doc.label = page + '-Wiki-' + frappe.session.user - doc.for_user = frappe.session.user - doc.for_wiki = 1 - doc.public = public - doc.charts = [] - doc.shortcuts = [] - doc.links = [] - return doc - @frappe.whitelist() def save_customization(page, config): """Save customizations as a separate doctype in Workspace per user @@ -605,24 +537,23 @@ def save_customization(page, config): return True -def save_new_widget(page, blocks, new_widgets, public=False): - page_doc = get_custom_wiki_for_user(page, public) +def save_new_widget(doc, page, blocks, new_widgets): widgets = _dict(loads(new_widgets)) if widgets.chart: - page_doc.charts.extend(new_widget(widgets.chart, "Workspace Chart", "charts")) + doc.charts.extend(new_widget(widgets.chart, "Workspace Chart", "charts")) if widgets.shortcut: - page_doc.shortcuts.extend(new_widget(widgets.shortcut, "Workspace Shortcut", "shortcuts")) + doc.shortcuts.extend(new_widget(widgets.shortcut, "Workspace Shortcut", "shortcuts")) if widgets.card: - page_doc.build_links_table_from_card(widgets.card) + doc.build_links_table_from_card(widgets.card) # remove duplicate and unwanted widgets if widgets: - clean_up(page_doc, blocks) + clean_up(doc, blocks) try: - page_doc.save(ignore_permissions=True) + doc.save(ignore_permissions=True) except (ValidationError, TypeError) as e: # Create a json string to log json_config = dumps(widgets, sort_keys=True, indent=4) @@ -638,12 +569,11 @@ def save_new_widget(page, blocks, new_widgets, public=False): return False return True - def clean_up(original_page, blocks): page_widgets = {} for wid in ['shortcut', 'card', 'chart']: - # get list of widget's name from internal wiki page + # get list of widget's name from blocks page_widgets[wid] = [x['data'][wid + '_name'] for x in json.loads(blocks) if x['type'] == wid] # shortcut & chart cleanup diff --git a/frappe/desk/doctype/internal_wiki/__init__.py b/frappe/desk/doctype/internal_wiki/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/frappe/desk/doctype/internal_wiki/internal_wiki.js b/frappe/desk/doctype/internal_wiki/internal_wiki.js deleted file mode 100644 index 6c86ac23df..0000000000 --- a/frappe/desk/doctype/internal_wiki/internal_wiki.js +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright (c) 2021, Frappe Technologies and contributors -// For license information, please see license.txt - -frappe.ui.form.on('Internal Wiki', { - // refresh: function(frm) { - - // } -}); diff --git a/frappe/desk/doctype/internal_wiki/internal_wiki.json b/frappe/desk/doctype/internal_wiki/internal_wiki.json deleted file mode 100644 index 64c75c47ce..0000000000 --- a/frappe/desk/doctype/internal_wiki/internal_wiki.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "actions": [], - "autoname": "field:title", - "creation": "2021-06-02 18:41:57.221425", - "doctype": "DocType", - "editable_grid": 1, - "engine": "InnoDB", - "field_order": [ - "title", - "wiki_pages" - ], - "fields": [ - { - "fieldname": "title", - "fieldtype": "Data", - "in_list_view": 1, - "label": "Title", - "reqd": 1, - "unique": 1 - }, - { - "fieldname": "wiki_pages", - "fieldtype": "Table", - "label": "Wiki Pages", - "options": "Internal Wiki Page" - } - ], - "index_web_pages_for_search": 1, - "links": [], - "modified": "2021-06-03 12:47:50.146962", - "modified_by": "Administrator", - "module": "Desk", - "name": "Internal Wiki", - "owner": "Administrator", - "permissions": [ - { - "create": 1, - "delete": 1, - "email": 1, - "export": 1, - "print": 1, - "read": 1, - "report": 1, - "role": "System Manager", - "share": 1, - "write": 1 - } - ], - "sort_field": "modified", - "sort_order": "DESC", - "track_changes": 1 -} \ No newline at end of file diff --git a/frappe/desk/doctype/internal_wiki/internal_wiki.py b/frappe/desk/doctype/internal_wiki/internal_wiki.py deleted file mode 100644 index a144d24c66..0000000000 --- a/frappe/desk/doctype/internal_wiki/internal_wiki.py +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright (c) 2021, Frappe Technologies and contributors -# For license information, please see license.txt - -from __future__ import unicode_literals -import frappe -import json -from frappe.desk.desktop import save_new_widget -from frappe.desk.doctype.internal_wiki_page.internal_wiki_page import new_internal_wiki_page, delete_page, sort_page -from frappe.model.document import Document - -class InternalWiki(Document): - pass - -@frappe.whitelist() -def get_wiki_pages(): - has_access = "System Manager" in frappe.get_roles() - - default_pages = frappe.get_doc("Internal Wiki", "Default").wiki_pages - pages = prepare_pages(default_pages) - if not frappe.db.exists("Internal Wiki", frappe.session.user): - return {"pages": pages, "has_access": has_access} - - user_pages = frappe.get_doc("Internal Wiki", frappe.session.user).wiki_pages - user_pages = prepare_pages(user_pages, True) - pages.extend(user_pages) - - return {"pages": pages, "has_access": has_access} - -def prepare_pages(pages, is_editable=False): - prepared_pages = [] - for p in pages: - page = { - "title": p.title, - "icon": p.icon, - "parent_wiki": p.parent, - "parent_page": p.parent_page, - "content": p.content, - "is_editable": is_editable or ("System Manager" in frappe.get_roles()) - } - prepared_pages.append(page) - return prepared_pages - -@frappe.whitelist() -def save_wiki_page(title, parent, public, sb_items, deleted_pages, new_widgets, blocks, save): - save = frappe.parse_json(save) - public = frappe.parse_json(public) - if save: - # create new Internal Wiki Page - new_doc = new_internal_wiki_page(title, blocks, parent, 'wiki_pages') - - if public: - doc = frappe.get_doc("Internal Wiki", "Default") - doc.wiki_pages.extend([new_doc]) - elif not frappe.db.exists("Internal Wiki", frappe.session.user): - doc = frappe.new_doc("Internal Wiki") - doc.title = frappe.session.user - doc.wiki_pages = [new_doc] - else: - doc = frappe.get_doc("Internal Wiki", frappe.session.user) - doc.wiki_pages.extend([new_doc]) - doc.save(ignore_permissions=True) - else: - for page in ["Default", frappe.session.user]: - if frappe.db.exists("Internal Wiki", page): - doc = frappe.get_doc("Internal Wiki", page) - for d in doc.wiki_pages: - if d.title == title: - d.content = blocks - break - doc.save(ignore_permissions=True) - - if json.loads(deleted_pages): - return delete_pages(json.loads(deleted_pages)) - - if json.loads(sb_items): - sort_pages(json.loads(sb_items)) - - if json.loads(new_widgets): - save_new_widget(title, blocks, new_widgets, public) - - return title - -def delete_pages(deleted_pages): - for page in deleted_pages: - # delete default Internal Wiki Page - if "System Manager" in frappe.get_roles(): - delete_page("Default", page) - - # delete user's Internal Wiki Page - if frappe.db.exists("Internal Wiki", frappe.session.user): - delete_page(frappe.session.user, page) - - # delete Workspace - filters = { - 'extends': page.get("title"), - 'for_user': frappe.session.user, - 'for_wiki': 1 - } - pages = frappe.get_list("Workspace", filters=filters) - if pages: - frappe.get_doc("Workspace", pages[0]).delete() - return 'Home' - -def sort_pages(sb_items): - # update the index of default Internal Wiki Pages based on sorted sidebar pages - if "System Manager" in frappe.get_roles(): - sort_page("Default", sb_items) - - # update the index of user's Internal Wiki Pages based on sorted sidebar pages - if frappe.db.exists("Internal Wiki", frappe.session.user): - sort_page(frappe.session.user, sb_items) \ No newline at end of file diff --git a/frappe/desk/doctype/internal_wiki/test_internal_wiki.py b/frappe/desk/doctype/internal_wiki/test_internal_wiki.py deleted file mode 100644 index 15fb04b822..0000000000 --- a/frappe/desk/doctype/internal_wiki/test_internal_wiki.py +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (c) 2021, Frappe Technologies and Contributors -# See license.txt - -# import frappe -import unittest - -class TestInternalWiki(unittest.TestCase): - pass diff --git a/frappe/desk/doctype/internal_wiki_page/__init__.py b/frappe/desk/doctype/internal_wiki_page/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.js b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.js deleted file mode 100644 index ece4bd5080..0000000000 --- a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.js +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright (c) 2021, Frappe Technologies and contributors -// For license information, please see license.txt - -frappe.ui.form.on('Internal Wiki Page', { - // refresh: function(frm) { - - // } -}); diff --git a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.json b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.json deleted file mode 100644 index 3bab22dbd0..0000000000 --- a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "actions": [], - "creation": "2021-05-02 14:44:26.490935", - "doctype": "DocType", - "editable_grid": 1, - "engine": "InnoDB", - "field_order": [ - "title", - "icon", - "parent_page", - "section_break_7", - "content" - ], - "fields": [ - { - "fieldname": "title", - "fieldtype": "Data", - "in_list_view": 1, - "label": "Title", - "reqd": 1 - }, - { - "fieldname": "icon", - "fieldtype": "Data", - "label": "Icon" - }, - { - "fieldname": "parent_page", - "fieldtype": "Data", - "in_list_view": 1, - "label": "Parent Page" - }, - { - "fieldname": "section_break_7", - "fieldtype": "Section Break" - }, - { - "fieldname": "content", - "fieldtype": "Long Text", - "label": "Content" - } - ], - "index_web_pages_for_search": 1, - "istable": 1, - "links": [], - "modified": "2021-06-03 12:46:31.540481", - "modified_by": "Administrator", - "module": "Desk", - "name": "Internal Wiki Page", - "owner": "Administrator", - "permissions": [], - "sort_field": "modified", - "sort_order": "DESC", - "track_changes": 1 -} \ No newline at end of file diff --git a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py deleted file mode 100644 index b73f7e1ddc..0000000000 --- a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py +++ /dev/null @@ -1,35 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2021, Frappe Technologies and contributors -# For license information, please see license.txt - -from __future__ import unicode_literals -import frappe -from frappe.model.document import Document - -class InternalWikiPage(Document): - pass - -def new_internal_wiki_page(title, blocks, parent, parentfield): - new_doc = frappe.new_doc('Internal Wiki Page') - new_doc.title = title - new_doc.content = blocks - new_doc.parent_page = parent - new_doc.parentfield = parentfield - return new_doc - -def delete_page(user, wiki_page): - doc = frappe.get_doc("Internal Wiki", user) - for idx, page in enumerate(doc.wiki_pages): - if page.title == wiki_page.get("title") and page.parent == wiki_page.get("parent_wiki"): - del doc.wiki_pages[idx] - doc.save(ignore_permissions=True) - -def sort_page(user, pages): - doc = frappe.get_doc("Internal Wiki", user) - for seq, d in enumerate(pages): - for page in doc.wiki_pages: - if page.title == d.get('title'): - page.idx = seq + 1 - page.parent_page = d.get('parent_page') or "" - break - doc.save(ignore_permissions=True) \ No newline at end of file diff --git a/frappe/desk/doctype/internal_wiki_page/test_internal_wiki_page.py b/frappe/desk/doctype/internal_wiki_page/test_internal_wiki_page.py deleted file mode 100644 index 85623ad41a..0000000000 --- a/frappe/desk/doctype/internal_wiki_page/test_internal_wiki_page.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2021, Frappe Technologies and Contributors -# See license.txt -from __future__ import unicode_literals - -# import frappe -import unittest - -class TestInternalWikiPage(unittest.TestCase): - pass diff --git a/frappe/desk/doctype/workspace/workspace.json b/frappe/desk/doctype/workspace/workspace.json index 2fe53c03be..b531274884 100644 --- a/frappe/desk/doctype/workspace/workspace.json +++ b/frappe/desk/doctype/workspace/workspace.json @@ -8,9 +8,11 @@ "engine": "InnoDB", "field_order": [ "label", + "title", + "sequence_id", "for_user", "extends", - "wiki_label", + "parent_page", "module", "category", "icon", @@ -25,8 +27,9 @@ "pin_to_top", "pin_to_bottom", "hide_custom", - "for_wiki", "public", + "content_section", + "content", "section_break_2", "charts_label", "charts", @@ -219,12 +222,6 @@ "fieldtype": "Check", "label": "Is Default" }, - { - "default": "0", - "fieldname": "for_wiki", - "fieldtype": "Check", - "label": "For Wiki" - }, { "default": "0", "fieldname": "public", @@ -232,13 +229,33 @@ "label": "Public" }, { - "fieldname": "wiki_label", + "fieldname": "title", + "fieldtype": "Data", + "label": "Title" + }, + { + "fieldname": "parent_page", "fieldtype": "Data", - "label": "Wiki Label" + "label": "Parent Page" + }, + { + "fieldname": "content_section", + "fieldtype": "Section Break", + "label": "Content" + }, + { + "fieldname": "content", + "fieldtype": "Long Text", + "label": "Content" + }, + { + "fieldname": "sequence_id", + "fieldtype": "Int", + "label": "Sequence Id" } ], "links": [], - "modified": "2021-06-09 18:39:47.947069", + "modified": "2021-07-05 17:41:36.272294", "modified_by": "Administrator", "module": "Desk", "name": "Workspace", diff --git a/frappe/desk/doctype/workspace/workspace.py b/frappe/desk/doctype/workspace/workspace.py index 2e522e6956..b0b03ca2f0 100644 --- a/frappe/desk/doctype/workspace/workspace.py +++ b/frappe/desk/doctype/workspace/workspace.py @@ -3,9 +3,11 @@ # For license information, please see license.txt import frappe +import json from frappe import _ from frappe.modules.export_file import export_to_files from frappe.model.document import Document +from frappe.desk.desktop import save_new_widget from frappe.desk.utils import validate_route_conflict from json import loads @@ -154,3 +156,102 @@ def get_link_type(key): def get_report_type(report): report_type = frappe.get_value("Report", report, "report_type") return report_type in ["Query Report", "Script Report", "Custom Report"] + + +@frappe.whitelist() +def get_pages(): + has_access = "System Manager" in frappe.get_roles() + fields = ['name', 'title', 'icon', 'public', 'parent_page', 'content'] + + pages = get_page_list(fields, { 'public': 1 }) + private_pages = get_page_list(fields, { 'for_user': frappe.session.user }) + + if private_pages: + pages.extend(private_pages) + + return { 'pages': pages, 'has_access': has_access } + +@frappe.whitelist() +def save_page(title, parent, public, sb_items, deleted_pages, new_widgets, blocks, save): + save = frappe.parse_json(save) + public = frappe.parse_json(public) + if save: + doc = frappe.new_doc('Workspace') + doc.title = title + doc.content = blocks + doc.parent_page = parent + + if public: + doc.label = title + doc.public = 1 + else: + doc.label = title + "-" + frappe.session.user + doc.for_user = frappe.session.user + doc.save(ignore_permissions=True) + else: + if public: + filters = { + 'public': public, + 'label': title + } + else: + filters = { + 'for_user': frappe.session.user, + 'label': title + "-" + frappe.session.user + } + pages = frappe.get_list("Workspace", filters=filters) + if pages: + doc = frappe.get_doc("Workspace", pages[0]) + + doc.content = blocks + doc.save(ignore_permissions=True) + + if json.loads(sb_items): + sort_pages(json.loads(sb_items)) + + if json.loads(new_widgets): + save_new_widget(doc, title, blocks, new_widgets) + + if json.loads(deleted_pages): + return delete_pages(json.loads(deleted_pages)) + + return { "name": title, "public": public } + +def delete_pages(deleted_pages): + for page in deleted_pages: + if page.get("public") and "System Manager" not in frappe.get_roles(): + return { "name": page.get("title"), "public": 1 } + + if frappe.db.exists("Workspace", page.get("name")): + frappe.get_doc("Workspace", page.get("name")).delete(ignore_permissions=True) + + return { "name": "Home", "public": 1 } + +def sort_pages(sb_items): + public_pages = [page for page in sb_items if page.get('public')=='1'] + private_pages = [page for page in sb_items if page.get('public')=='0'] + + wspace_public_pages = get_page_list(['name', 'title'], { 'public': 1 }) + wspace_private_pages = get_page_list(['name', 'title'], { 'for_user': frappe.session.user }) + + sort_page(wspace_private_pages, private_pages) + + if "System Manager" in frappe.get_roles(): + sort_page(wspace_public_pages, public_pages) + +def sort_page(wspace_pages, pages): + for seq, d in enumerate(pages): + for page in wspace_pages: + if page.title == d.get('title'): + doc = frappe.get_doc('Workspace', page.name) + doc.sequence_id = seq + 1 + doc.parent_page = d.get('parent_page') or "" + doc.save(ignore_permissions=True) + break + +def get_page_list(fields, filters): + return frappe.get_list("Workspace", + fields=fields, + filters=filters, + order_by='sequence_id asc' + ) diff --git a/frappe/desk/page/wiki/__init__.py b/frappe/desk/page/wiki/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/frappe/desk/page/wiki/wiki.js b/frappe/desk/page/wiki/wiki.js deleted file mode 100644 index 6ac8bc89cb..0000000000 --- a/frappe/desk/page/wiki/wiki.js +++ /dev/null @@ -1,15 +0,0 @@ -frappe.provide('frappe.views'); - -frappe.pages['wiki'].on_page_load = function(wrapper) { - frappe.ui.make_app_page({ - parent: wrapper, - name: "Wiki", - single_column: false, - }); - - frappe.wiki = new frappe.views.Wiki(wrapper); - - $(wrapper).bind('show', function () { - frappe.wiki.show(); - }); -}; diff --git a/frappe/desk/page/wiki/wiki.json b/frappe/desk/page/wiki/wiki.json deleted file mode 100644 index f886264e1c..0000000000 --- a/frappe/desk/page/wiki/wiki.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "content": null, - "creation": "2021-05-02 14:50:05.327302", - "docstatus": 0, - "doctype": "Page", - "idx": 0, - "modified": "2021-05-02 14:50:05.327302", - "modified_by": "Administrator", - "module": "Desk", - "name": "wiki", - "owner": "Administrator", - "page_name": "wiki", - "roles": [], - "script": null, - "standard": "Yes", - "style": null, - "system_page": 0, - "title": "Wiki" -} \ No newline at end of file diff --git a/frappe/patches.txt b/frappe/patches.txt index 7605d8ea2b..0d46a2e3dd 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -180,3 +180,4 @@ frappe.patches.v12_0.rename_uploaded_files_with_proper_name frappe.patches.v13_0.queryreport_columns frappe.patches.v13_0.jinja_hook frappe.patches.v13_0.update_notification_channel_if_empty +frappe.patches.v13_0.update_workspace diff --git a/frappe/patches/v13_0/update_workspace.py b/frappe/patches/v13_0/update_workspace.py new file mode 100644 index 0000000000..6175184716 --- /dev/null +++ b/frappe/patches/v13_0/update_workspace.py @@ -0,0 +1,49 @@ +from hashlib import new +import frappe +import json +from frappe import _ + +def execute(): + frappe.reload_doc('desk', 'doctype', 'workspace', force=True) + order_by = "pin_to_top desc, pin_to_bottom asc, name asc" + for seq, wspace in enumerate(frappe.get_all('Workspace', order_by=order_by)): + doc = frappe.get_doc('Workspace', wspace.name) + content = create_content(doc) + create_wspace_copy(doc, seq, content) + frappe.db.commit() + +def create_content(doc): + content = [] + if doc.charts: + for c in doc.charts: + content.append({"type":"chart","data":{"chart_name":c.label,"col":12,"pt":0,"pr":0,"pb":0,"pl":0}}) + if doc.shortcuts: + content.append({"type":"spacer","data":{"col":12,"pt":0,"pr":0,"pb":0,"pl":0}}) + content.append({"type":"header","data":{"text":doc.shortcuts_label or _("Your Shortcuts"),"level":4,"col":12,"pt":0,"pr":0,"pb":0,"pl":0}}) + for s in doc.shortcuts: + content.append({"type":"shortcut","data":{"shortcut_name":s.label,"col":4,"pt":0,"pr":0,"pb":0,"pl":0}}) + if doc.links: + content.append({"type":"spacer","data":{"col":12,"pt":0,"pr":0,"pb":0,"pl":0}}) + content.append({"type":"header","data":{"text":doc.cards_label or _("Reports & Masters"),"level":4,"col":12,"pt":0,"pr":0,"pb":0,"pl":0}}) + for l in doc.links: + if l.type == 'Card Break': + content.append({"type":"card","data":{"card_name":l.label,"col":4,"pt":0,"pr":0,"pb":0,"pl":0}}) + return content + +def create_wspace_copy(doc, seq, content): + new_doc = frappe.new_doc('Workspace') + new_doc.content = json.dumps(content) + new_doc.sequence_id = seq + 1 + new_doc.charts = doc.charts or [] + new_doc.shortcuts = doc.shortcuts or [] + new_doc.links = doc.links or [] + new_doc.label = doc.label + new_doc.icon = doc.icon + if doc.is_standard: + new_doc.public = 1 + new_doc.title = doc.label + else: + new_doc.for_user = doc.for_user + new_doc.title = doc.extends + doc.delete() + new_doc.insert() \ No newline at end of file diff --git a/frappe/public/build.json b/frappe/public/build.json index 4536e1d4bc..ccdb895366 100755 --- a/frappe/public/build.json +++ b/frappe/public/build.json @@ -178,7 +178,6 @@ "public/js/frappe/views/breadcrumbs.js", "public/js/frappe/views/factory.js", "public/js/frappe/views/pageview.js", - "public/js/frappe/views/wiki.js", "public/js/frappe/ui/toolbar/awesome_bar.js", "public/js/frappe/ui/toolbar/energy_points_notifications.js", @@ -194,11 +193,10 @@ "public/js/frappe/views/communication.js", "public/js/frappe/views/translation_manager.js", "public/js/frappe/views/workspace/workspace.js", + "public/js/frappe/views/workspace/blocks/index.js", "public/js/frappe/widgets/widget_group.js", - "public/js/frappe/wiki_blocks/blocks.js", - "public/js/frappe/ui/sort_selector.html", "public/js/frappe/ui/sort_selector.js", diff --git a/frappe/public/js/desk.bundle.js b/frappe/public/js/desk.bundle.js index 0f75ae2d6a..b243de205a 100644 --- a/frappe/public/js/desk.bundle.js +++ b/frappe/public/js/desk.bundle.js @@ -67,7 +67,6 @@ import "./frappe/views/container.js"; import "./frappe/views/breadcrumbs.js"; import "./frappe/views/factory.js"; import "./frappe/views/pageview.js"; -import "./frappe/views/wiki.js"; import "./frappe/ui/toolbar/awesome_bar.js"; // import "./frappe/ui/toolbar/energy_points_notifications.js"; @@ -83,11 +82,10 @@ import "./frappe/ui/toolbar/toolbar.js"; import "./frappe/views/communication.js"; import "./frappe/views/translation_manager.js"; import "./frappe/views/workspace/workspace.js"; +import "./frappe/views/workspace/blocks/index.js"; import "./frappe/widgets/widget_group.js"; -import "./frappe/wiki_blocks/blocks.js"; - import "./frappe/ui/sort_selector.html"; import "./frappe/ui/sort_selector.js"; diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js index 46812f5fb6..7de0ddd2b5 100644 --- a/frappe/public/js/frappe/desk.js +++ b/frappe/public/js/frappe/desk.js @@ -285,7 +285,7 @@ frappe.Application = class Application { frappe.workspaces = {}; for (let page of frappe.boot.allowed_workspaces || []) { frappe.modules[page.module]=page; - frappe.workspaces[frappe.router.slug(page.name)] = page; + frappe.workspaces[frappe.router.slug(page.title)] = page; } if (!frappe.workspaces['home']) { // default workspace is settings for Frappe diff --git a/frappe/public/js/frappe/router.js b/frappe/public/js/frappe/router.js index 05f97cf24c..0781127071 100644 --- a/frappe/public/js/frappe/router.js +++ b/frappe/public/js/frappe/router.js @@ -119,7 +119,7 @@ frappe.router = { convert_to_standard_route(route) { // /app/settings = ["Workspaces", "Settings"] - // /app/wiki/accounting = ["wiki", "Accounting"] + // /app/private/settings = ["Workspaces", "private", "Settings"] // /app/user = ["List", "User"] // /app/user/view/report = ["List", "User", "Report"] // /app/user/view/tree = ["Tree", "User"] @@ -128,11 +128,11 @@ frappe.router = { // /app/event/view/calendar/default = ["List", "Event", "Calendar", "Default"] if (frappe.workspaces[route[0]]) { - // workspace - route = ['Workspaces', frappe.workspaces[route[0]].name]; - } else if (frappe.wiki_pages && frappe.wiki_pages[route[1]]) { - // wiki-pages - route = ['wiki', frappe.wiki_pages[route[1]].name]; + // public workspace + route = ['Workspaces', frappe.workspaces[route[0]].title]; + } else if (frappe.workspaces[route[1]]) { + // private workspace + route = ['Workspaces', 'private', frappe.workspaces[route[1]].title]; } else if (this.routes[route[0]]) { // route route = this.set_doctype_route(route); @@ -141,6 +141,11 @@ frappe.router = { return route; }, + doctype_route_exist(route) { + route = this.get_sub_path_string(route).split('/'); + return this.routes[route[0]] + }, + set_doctype_route(route) { let doctype_route = this.routes[route[0]]; // doctype route diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js deleted file mode 100644 index fa3e43b656..0000000000 --- a/frappe/public/js/frappe/views/wiki.js +++ /dev/null @@ -1,594 +0,0 @@ -import EditorJS from '@editorjs/editorjs'; -import Undo from 'editorjs-undo'; - -frappe.views.Wiki = class Wiki { - constructor(wrapper) { - this.wrapper = $(wrapper); - this.page = wrapper.page; - this.pages = {}; - this.sections = {}; - this.sidebar_items = {}; - this.sorted_sidebar_items = []; - this.deleted_sidebar_items = []; - this.isReadOnly = true; - this.new_page = null; - this.prepare_container(); - this.setup_wiki_pages(); - this.tools = { - header: { - class: frappe.wiki_block.blocks['header'], - inlineToolbar: true - }, - paragraph: { - class: frappe.wiki_block.blocks['paragraph'], - inlineToolbar: true - }, - chart: { - class: frappe.wiki_block.blocks['chart'], - config: { - page_data: this.page_data || [] - } - }, - card: { - class: frappe.wiki_block.blocks['card'], - config: { - page_data: this.page_data || [] - } - }, - shortcut: { - class: frappe.wiki_block.blocks['shortcut'], - config: { - page_data: this.page_data || [] - } - }, - spacer: frappe.wiki_block.blocks['spacer'], - spacingTune: frappe.wiki_block.tunes['spacing_tune'], - }; - } - - prepare_container() { - let list_sidebar = $(` - - `).appendTo(this.wrapper.find(".layout-side-section")); - this.sidebar = list_sidebar.find(".desk-sidebar"); - this.body = this.wrapper.find(".layout-main-section"); - } - - setup_wiki_pages() { - this.get_wiki_pages().then(pages => { - this.all_pages = pages.pages; - this.has_access = pages.has_access; - if (this.all_pages) { - frappe.wiki_pages = {}; - for (let page of this.all_pages) { - frappe.wiki_pages[frappe.router.slug(page.title)] = {name: page.title}; - } - if (this.new_page) { - if (!frappe.wiki_pages[frappe.router.slug(this.new_page)]) { - this.new_page = this.all_pages[0].title; - } - frappe.set_route(`wiki/${frappe.router.slug(this.new_page)}`); - this.new_page = null; - } - this.make_sidebar(); - frappe.router.route(); - } - }); - } - - get_wiki_pages() { - return frappe.xcall("frappe.desk.doctype.internal_wiki.internal_wiki.get_wiki_pages"); - } - - sidebar_item_container(item) { - return $(` -
-
- - ${frappe.utils.icon(item.icon || "folder-normal", "md")} - ${item.label || item.title} - -
-
-
- `); - } - - make_sidebar() { - if (this.sidebar.find('.standard-sidebar-section')[0]) { - this.sidebar.find('.standard-sidebar-section')[0].remove(); - } - let root_pages = this.all_pages.filter(page => page.parent_page == '' || page.parent_page == null); - let sidebar_section = $(`
`); - this.prepare_sidebar(root_pages, sidebar_section, this.sidebar); - } - - prepare_sidebar(items, child_container, item_container) { - items.forEach(item => this.append_item(item, child_container)); - child_container.appendTo(item_container); - } - - append_item(item, container) { - let is_current_page = frappe.router.slug(item.title) == frappe.router.slug(this.get_page_to_show()); - if (is_current_page) { - item.selected = true; - this.current_page_name = item.title; - } - - let $item_container = this.sidebar_item_container(item); - let sidebar_control = $item_container.find('.sidebar-item-control'); - - this.add_sidebar_actions(item, sidebar_control); - - let child_items = this.all_pages.filter(page => page.parent_page == item.title); - if (child_items.length > 0) { - let child_container = $(``); - this.prepare_sidebar(child_items, child_container, $item_container); - } - - $item_container.appendTo(container); - this.sidebar_items[item.title] = $item_container; - - if ($item_container.parent().hasClass('hidden') && is_current_page) { - $item_container.parent().toggleClass('hidden'); - } - - this.add_drop_icon(item, sidebar_control, $item_container); - } - - add_drop_icon(item, sidebar_control, item_container) { - let $child_item_section = item_container.find('.sidebar-child-item'); - let $drop_icon = $(``) - .appendTo(sidebar_control); - - if (this.all_pages.some(e => e.parent_page == item.title)) { - $drop_icon.removeClass('hidden'); - $drop_icon.on('click', () => { - let icon = $drop_icon.find("use").attr("href")==="#icon-small-down" ? "#icon-small-up" : "#icon-small-down"; - $drop_icon.find("use").attr("href", icon); - $child_item_section.toggleClass("hidden"); - }); - } - } - - show() { - if (!this.all_pages) { - // pages not yet loaded, call again after a bit - setTimeout(() => { - this.show(); - }, 100); - return; - } - - let page = this.get_page_to_show(); - this.page.set_title(`${__(page)}`); - - this.show_page(page); - } - - get_data(page) { - return frappe.xcall("frappe.desk.desktop.get_desktop_page", { - page: page, - wiki: true - }).then(data => { - this.page_data = data; - this.pages[page] && delete this.pages[page]; - this.pages[page] = data; - if (!this.page_data || Object.keys(this.page_data).length === 0) return; - - return frappe.dashboard_utils.get_dashboard_settings().then(settings => { - let chart_config = settings.chart_config ? JSON.parse(settings.chart_config) : {}; - if (this.page_data.charts && this.page_data.charts.items) { - this.page_data.charts.items.map(chart => { - chart.chart_settings = chart_config[chart.chart_name] || {}; - }); - } - }); - }); - } - - get_page_to_show() { - let default_page; - - if (localStorage.current_wiki_page) { - default_page = localStorage.current_wiki_page; - } else if (Object.keys(this.all_pages).length !== 0) { - default_page = this.all_pages[0].title; - } else { - default_page = "Build"; - } - - let page = frappe.get_route()[1] || default_page; - return page; - } - - show_page(page) { - if (this.sidebar_items && this.sidebar_items[this.current_page_name]) { - this.sidebar_items[this.current_page_name][0].firstElementChild.classList.remove("selected"); - this.sidebar_items[page][0].firstElementChild.classList.add("selected"); - - if (this.sidebar_items[page].parents('.sidebar-item-container')[0]) { - this.sidebar_items[page] - .parents('.sidebar-item-container') - .find('.drop-icon use') - .attr("href", "#icon-small-up"); - } - } - - this.current_page_name = page; - localStorage.current_wiki_page = page; - - if (!this.body.find('#editorjs')[0]) { - this.$page = $(` -
- `).appendTo(this.body); - } - - if (this.all_pages) { - let this_page = this.all_pages.filter(p => p.title == page)[0]; - this.setup_actions(page); - this.content = this_page && JSON.parse(this_page.content); - if (this.pages[page]) { - this.page_data = this.pages[page]; - this.prepare_editorjs(); - } else { - this.get_data(page).then(() => { - this.prepare_editorjs(); - }); - } - } - } - - prepare_editorjs() { - if (this.editor) { - this.editor.isReady.then(() => { - this.editor.configuration.tools.chart.config.page_data = this.page_data; - this.editor.configuration.tools.shortcut.config.page_data = this.page_data; - this.editor.configuration.tools.card.config.page_data = this.page_data; - this.editor.render({ - blocks: this.content || [] - }); - }); - } else { - this.initialize_editorjs(this.content); - } - } - - setup_actions(page) { - let this_page = this.all_pages.filter(p => p.title == page)[0]; - - if (!this.isReadOnly) { - this.setup_customization_buttons(this_page.is_editable); - return; - } - - this.page.clear_primary_action(); - this.page.clear_secondary_action(); - this.page.clear_inner_toolbar(); - - this_page.is_editable && this.page.set_secondary_action(__("Customize"), () => { - if (!this.editor || !this.editor.readOnly) return; - this.isReadOnly = false; - this.editor.readOnly.toggle(); - this.editor.isReady - .then(() => { - this.initialize_editorjs_undo(); - this.setup_customization_buttons(true); - this.show_sidebar_actions(); - this.make_sidebar_sortable(); - this.make_blocks_sortable(); - }); - }); - - this.page.add_inner_button(__("Create Page"), () => { - this.initialize_new_page(); - }); - } - - initialize_editorjs_undo() { - this.undo = new Undo({ editor: this.editor }); - this.undo.initialize({blocks: this.content || []}); - this.undo.readOnly = false; - } - - setup_customization_buttons(is_editable) { - this.page.clear_primary_action(); - this.page.clear_secondary_action(); - this.page.clear_inner_toolbar(); - - is_editable && this.page.set_primary_action( - __("Save Customizations"), - () => { - this.page.clear_primary_action(); - this.page.clear_secondary_action(); - this.undo.readOnly = true; - this.save_page(); - this.editor.readOnly.toggle(); - this.isReadOnly = true; - }, - null, - __("Saving") - ); - - this.page.set_secondary_action( - __("Discard"), - () => { - this.page.clear_primary_action(); - this.page.clear_secondary_action(); - this.editor.readOnly.toggle(); - this.isReadOnly = true; - this.deleted_sidebar_items = []; - this.reload(); - frappe.show_alert({ message: __("Customizations Discarded"), indicator: "info" }); - } - ); - } - - show_sidebar_actions() { - this.sidebar.find('.standard-sidebar-section').addClass('show-control'); - } - - add_sidebar_actions(item, sidebar_control) { - if (!item.is_editable) { - $(`${frappe.utils.icon("lock", "sm")}`) - .appendTo(sidebar_control); - sidebar_control.find('.sidebar-info').click(() => { - frappe.show_alert({ - message: __("Only owner can sort of edit this page"), - indicator: 'info' - }, 5); - }); - } else { - frappe.utils.add_custom_button( - frappe.utils.icon('drag', 'xs'), - null, - "drag-handle", - `${__('Drag')}`, - null, - sidebar_control - ); - frappe.utils.add_custom_button( - frappe.utils.icon('delete', 'xs'), - () => this.delete_page(item), - "delete-page", - `${__('Delete')}`, - null, - sidebar_control - ); - } - } - - delete_page(item) { - frappe.confirm(__("Are you sure you want to delete page {0}?", [item.title]), () => { - this.deleted_sidebar_items.push(item); - this.sidebar.find(`.standard-sidebar-section [item-name="${item.title}"]`).addClass('hidden'); - }); - } - - make_sidebar_sortable() { - let me = this; - $('.nested-container').each( function() { - new Sortable(this, { - handle: ".drag-handle", - draggable: ".sidebar-item-container.is-draggable", - group: 'nested', - animation: 150, - fallbackOnBody: true, - swapThreshold: 0.65, - onEnd: function () { - me.prepare_sorted_sidebar(); - } - }); - }); - } - - prepare_sorted_sidebar() { - this.sorted_sidebar_items = []; - for (let page of $('.standard-sidebar-section').find('.sidebar-item-container')) { - let parent_page = ""; - if (page.closest('.nested-container').classList.contains('sidebar-child-item')) { - parent_page = page.parentElement.parentElement.attributes["item-name"].value; - } - this.sorted_sidebar_items.push({ - title: page.attributes['item-name'].value, - parent_page: parent_page - }); - } - } - - make_blocks_sortable() { - let me = this; - this.page_sortable = Sortable.create(this.page.main.find(".codex-editor__redactor").get(0), { - handle: ".drag-handle", - draggable: ".ce-block", - animation: 150, - onEnd: function (evt) { - me.editor.blocks.move(evt.newIndex, evt.oldIndex); - }, - setData: function () { - //Do Nothing - } - }); - } - - initialize_new_page() { - let parent_pages = this.all_pages - .filter(page => !page.parent_page && page.parent_wiki != "Default") - .map(page => page.title); - if (this.has_access) { - parent_pages = this.all_pages.filter(page => !page.parent_page).map(page => page.title); - } - parent_pages.unshift(''); - const d = new frappe.ui.Dialog({ - title: __('Set Title'), - fields: [ - { - label: __('Title'), - fieldtype: 'Data', - fieldname: 'title', - reqd: 1 - }, - { - label: __('Parent'), - fieldtype: 'Select', - fieldname: 'parent', - options: parent_pages - }, - { - label: __('Public'), - fieldtype: 'Check', - fieldname: 'public', - depends_on: `eval:${this.has_access}` - } - ], - primary_action_label: __('Create'), - primary_action: (values) => { - if (this.all_pages.filter(p => p.title == values.title)[0]) { - frappe.throw(__("Page with title '{0}' already exist.", [__(values.title)])); - return; - } - d.hide(); - this.initialize_editorjs_undo(); - this.setup_customization_buttons(true); - this.title = values.title; - this.parent = values.parent; - this.public = values.public; - this.editor.render({ - blocks: [ - { - type: "header", - data: { - text: this.title, - level: 4 - } - } - ] - }).then(() => { - if (this.editor.configuration.readOnly) { - this.isReadOnly = false; - this.editor.readOnly.toggle(); - } - this.add_page_to_sidebar(values); - this.show_sidebar_actions(); - this.make_sidebar_sortable(); - this.make_blocks_sortable(); - this.prepare_sorted_sidebar(); - }); - } - }); - d.show(); - } - - add_page_to_sidebar({title, parent}) { - let $sidebar = $('.standard-sidebar-section'); - let item = { - title: title, - parent_page: parent - }; - let $sidebar_item = this.sidebar_item_container(item); - - frappe.utils.add_custom_button( - frappe.utils.icon('drag', 'xs'), - null, - "drag-handle", - `${__('Drag')}`, - null, - $sidebar_item.find('.sidebar-item-control') - ); - - if (!parent) { - $sidebar_item.appendTo($sidebar); - } else { - let $item_container = $sidebar.find(`[item-name="${parent}"]`); - let $child_section = $item_container.find('.sidebar-child-item'); - let $drop_icon = $item_container.find('.drop-icon'); - if (!$child_section[0]) { - $child_section = $(``) - .appendTo($item_container); - $drop_icon.toggleClass('hidden'); - } - $sidebar_item.appendTo($child_section); - $child_section.removeClass('hidden'); - $item_container.find('.drop-icon use').attr("href", "#icon-small-up"); - } - } - - initialize_editorjs(blocks) { - this.editor = new EditorJS({ - data: { - blocks: blocks || [] - }, - tools: this.tools, - autofocus: false, - tunes: ['spacingTune'], - readOnly: true, - logLevel: 'ERROR' - }); - } - - save_page() { - frappe.dom.freeze(); - let save = true; - if (!this.title && this.current_page_name) { - this.title = this.current_page_name; - this.public = this.all_pages.filter(p => p.title == this.title)[0].parent_wiki == "Default"; - save = false; - } else { - this.current_page_name = this.title; - } - let me = this; - this.editor.save().then((outputData) => { - let new_widgets = {}; - outputData.blocks.forEach(item => { - if (item.data.new) { - if (!new_widgets[item.type]) { - new_widgets[item.type] = []; - } - new_widgets[item.type].push(item.data.new); - delete item.data['new']; - } - }); - - frappe.call({ - method: "frappe.desk.doctype.internal_wiki.internal_wiki.save_wiki_page", - args: { - title: me.title, - parent: me.parent || '', - public: me.public || 0, - sb_items: me.sorted_sidebar_items, - deleted_pages: me.deleted_sidebar_items, - new_widgets: new_widgets, - blocks: JSON.stringify(outputData.blocks), - save: save - }, - callback: function(res) { - frappe.dom.unfreeze(); - if (res.message) { - frappe.show_alert({ message: __("Page Saved Successfully"), indicator: "green" }); - me.pages[res.message] && delete me.pages[res.message]; - me.title = ''; - me.parent = ''; - me.public = false; - me.sorted_sidebar_items = []; - me.deleted_sidebar_items = []; - me.new_page = res.message; - me.reload(); - } - } - }); - }).catch((error) => { - error; - // console.log('Saving failed: ', error); - }); - } - - reload() { - this.setup_wiki_pages(); - this.undo.readOnly = true; - } -}; diff --git a/frappe/public/js/frappe/wiki_blocks/block.js b/frappe/public/js/frappe/views/workspace/blocks/block.js similarity index 98% rename from frappe/public/js/frappe/wiki_blocks/block.js rename to frappe/public/js/frappe/views/workspace/blocks/block.js index dde93b3887..8ae9610096 100644 --- a/frappe/public/js/frappe/wiki_blocks/block.js +++ b/frappe/public/js/frappe/views/workspace/blocks/block.js @@ -1,4 +1,4 @@ -import get_dialog_constructor from "../widgets/widget_dialog.js"; +import get_dialog_constructor from "../../../widgets/widget_dialog.js"; export default class Block { constructor(opts) { diff --git a/frappe/public/js/frappe/wiki_blocks/card.js b/frappe/public/js/frappe/views/workspace/blocks/card.js similarity index 100% rename from frappe/public/js/frappe/wiki_blocks/card.js rename to frappe/public/js/frappe/views/workspace/blocks/card.js diff --git a/frappe/public/js/frappe/wiki_blocks/chart.js b/frappe/public/js/frappe/views/workspace/blocks/chart.js similarity index 100% rename from frappe/public/js/frappe/wiki_blocks/chart.js rename to frappe/public/js/frappe/views/workspace/blocks/chart.js diff --git a/frappe/public/js/frappe/wiki_blocks/header.js b/frappe/public/js/frappe/views/workspace/blocks/header.js similarity index 100% rename from frappe/public/js/frappe/wiki_blocks/header.js rename to frappe/public/js/frappe/views/workspace/blocks/header.js diff --git a/frappe/public/js/frappe/views/workspace/blocks/index.js b/frappe/public/js/frappe/views/workspace/blocks/index.js new file mode 100644 index 0000000000..d8b303133f --- /dev/null +++ b/frappe/public/js/frappe/views/workspace/blocks/index.js @@ -0,0 +1,25 @@ +// import blocks +import Header from "./header"; +import Paragraph from "./paragraph"; +import Card from "./card"; +import Chart from "./chart"; +import Shortcut from "./shortcut"; +import Spacer from "./spacer"; + +// import tunes +import SpacingTune from "./spacing_tune"; + +frappe.provide("frappe.wspace_block"); + +frappe.wspace_block.blocks = { + header: Header, + paragraph: Paragraph, + card: Card, + chart: Chart, + shortcut: Shortcut, + spacer: Spacer, +}; + +frappe.wspace_block.tunes = { + spacing_tune: SpacingTune +}; \ No newline at end of file diff --git a/frappe/public/js/frappe/wiki_blocks/paragraph.js b/frappe/public/js/frappe/views/workspace/blocks/paragraph.js similarity index 100% rename from frappe/public/js/frappe/wiki_blocks/paragraph.js rename to frappe/public/js/frappe/views/workspace/blocks/paragraph.js diff --git a/frappe/public/js/frappe/wiki_blocks/shortcut.js b/frappe/public/js/frappe/views/workspace/blocks/shortcut.js similarity index 100% rename from frappe/public/js/frappe/wiki_blocks/shortcut.js rename to frappe/public/js/frappe/views/workspace/blocks/shortcut.js diff --git a/frappe/public/js/frappe/wiki_blocks/spacer.js b/frappe/public/js/frappe/views/workspace/blocks/spacer.js similarity index 100% rename from frappe/public/js/frappe/wiki_blocks/spacer.js rename to frappe/public/js/frappe/views/workspace/blocks/spacer.js diff --git a/frappe/public/js/frappe/wiki_blocks/spacing_tune.js b/frappe/public/js/frappe/views/workspace/blocks/spacing_tune.js similarity index 100% rename from frappe/public/js/frappe/wiki_blocks/spacing_tune.js rename to frappe/public/js/frappe/views/workspace/blocks/spacing_tune.js diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index 80f8c00705..8a4f49a8a3 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -1,3 +1,6 @@ +import EditorJS from '@editorjs/editorjs'; +import Undo from 'editorjs-undo'; + frappe.standard_pages['Workspaces'] = function() { var wrapper = frappe.container.add_page('Workspaces'); @@ -17,37 +20,51 @@ frappe.views.Workspace = class Workspace { constructor(wrapper) { this.wrapper = $(wrapper); this.page = wrapper.page; - this.prepare_container(); - this.show_or_hide_sidebar(); - this.setup_dropdown(); - this.pages = {}; - this.sidebar_items = {}; + this.isReadOnly = true; + this.new_page = null; + this.sorted_sidebar_items = []; + this.deleted_sidebar_items = []; + this.sidebar_items = { + 'public': {}, + 'private': {} + } this.sidebar_categories = [ - "Modules", - "Domains", - "Places", - "Administration" + "Public", + frappe.user.first_name() ]; + this.tools = { + header: { + class: frappe.wspace_block.blocks['header'], + inlineToolbar: true + }, + paragraph: { + class: frappe.wspace_block.blocks['paragraph'], + inlineToolbar: true + }, + chart: { + class: frappe.wspace_block.blocks['chart'], + config: { + page_data: this.page_data || [] + } + }, + card: { + class: frappe.wspace_block.blocks['card'], + config: { + page_data: this.page_data || [] + } + }, + shortcut: { + class: frappe.wspace_block.blocks['shortcut'], + config: { + page_data: this.page_data || [] + } + }, + spacer: frappe.wspace_block.blocks['spacer'], + spacingTune: frappe.wspace_block.tunes['spacing_tune'], + }; - this.setup_workspaces(); - this.make_sidebar(); - } - - setup_workspaces() { - // workspaces grouped by categories - this.workspaces = {}; - for (let page of frappe.boot.allowed_workspaces) { - if (!this.workspaces[page.category]) { - this.workspaces[page.category] = []; - } - this.workspaces[page.category].push(page); - } - } - - show() { - let page = this.get_page_to_show(); - this.page.set_title(`${__(page)}`); - this.show_page(page); + this.prepare_container(); + this.setup_pages(); } prepare_container() { @@ -57,358 +74,605 @@ frappe.views.Workspace = class Workspace {
`).appendTo(this.wrapper.find(".layout-side-section")); this.sidebar = list_sidebar.find(".desk-sidebar"); - this.body = this.wrapper.find(".layout-main-section"); } - get_page_to_show() { - let default_page; + setup_pages() { + this.get_pages().then(pages => { + this.all_pages = pages.pages; + this.has_access = pages.has_access; - if (localStorage.current_workspace) { - default_page = localStorage.current_workspace; - } else if (this.workspaces) { - default_page = this.workspaces["Modules"][0].name; - } else if (frappe.boot.allowed_workspaces) { - default_page = frappe.boot.allowed_workspaces[0].name; - } else { - default_page = "Build"; - } + this.all_pages.forEach(page => { + page.is_editable = !page.public || pages.has_access; + }); + + this.public_pages = this.all_pages.filter(page => page.public); + this.private_pages = this.all_pages.filter(page => !page.public); + + if (this.all_pages) { + frappe.workspaces = {}; + for (let page of this.all_pages) { + frappe.workspaces[frappe.router.slug(page.title)] = {title: page.title}; + } + if (this.new_page && this.new_page.name) { + if (!frappe.workspaces[frappe.router.slug(this.new_page.name)]) { + this.new_page = { name:this.all_pages[0].title, public:this.all_pages[0].public }; + } + if (this.new_page.public) { + frappe.set_route(`${frappe.router.slug(this.new_page.name)}`); + } else{ + frappe.set_route(`private/${frappe.router.slug(this.new_page.name)}`); + } + this.new_page = null; + } + this.make_sidebar(); + frappe.router.route(); + } + }); + } + + get_pages() { + return frappe.xcall("frappe.desk.doctype.workspace.workspace.get_pages"); + } - let page = frappe.get_route()[1] || default_page; - return page; + sidebar_item_container(item) { + return $(` +
+
+ + ${frappe.utils.icon(item.icon || "folder-normal", "md")} + ${item.title} + +
+
+
+ `); } make_sidebar() { + if (this.sidebar.find('.standard-sidebar-section')[0]) { + this.sidebar.find('.standard-sidebar-section').remove(); + } + this.sidebar_categories.forEach(category => { - if (this.workspaces[category]) { - this.build_sidebar_section(category, this.workspaces[category]); + let root_pages = this.public_pages.filter(page => page.parent_page == '' || page.parent_page == null); + if (category != 'Public') { + root_pages = this.private_pages.filter(page => page.parent_page == '' || page.parent_page == null); } + this.build_sidebar_section(category, root_pages); }); } - build_sidebar_section(title, items) { - let sidebar_section = $(`
`); - - // DO NOT REMOVE: Comment to load translation - // __("Modules") __("Domains") __("Places") __("Administration") - $(`
${__(title)}
`) - .appendTo(sidebar_section); - - const get_sidebar_item = function (item) { - return $(` - - ${frappe.utils.icon(item.icon || "folder-normal", "md")} - ${item.label || item.name} - - `); - }; - - const make_sidebar_category_item = item => { - if (item.name == this.get_page_to_show()) { - item.selected = true; - this.current_page_name = item.name; - } + build_sidebar_section(title, root_pages) { + let sidebar_section = $(`
`); - let $item = get_sidebar_item(item); + let $title = $(`
+ ${frappe.utils.icon("small-down", "xs")} + ${__(title)} +
`).appendTo(sidebar_section); + this.prepare_sidebar(root_pages, sidebar_section, this.sidebar); - $item.appendTo(sidebar_section); - this.sidebar_items[item.name] = $item; - }; + $title.on('click', (e) => { + let icon = $(e.target).find("span use").attr("href")==="#icon-small-down" ? "#icon-right" : "#icon-small-down"; + $(e.target).find("span use").attr("href", icon); + $(e.target).parent().find('.sidebar-item-container').toggleClass('hidden'); + }) - items.forEach(item => make_sidebar_category_item(item)); + if (Object.keys(root_pages).length === 0) { + sidebar_section.addClass('hidden'); + } + } - sidebar_section.appendTo(this.sidebar); + prepare_sidebar(items, child_container, item_container) { + items.forEach(item => this.append_item(item, child_container)); + child_container.appendTo(item_container); } - show_page(page) { - if (this.current_page_name && this.pages[this.current_page_name]) { - this.pages[this.current_page_name].hide(); + append_item(item, container) { + let is_current_page = frappe.router.slug(item.title) == frappe.router.slug(this.get_page_to_show().name) + && item.public == this.get_page_to_show().public; + if (is_current_page) { + item.selected = true; + this.current_page = { name: item.title, public: item.public }; } - if (this.sidebar_items && this.sidebar_items[this.current_page_name]) { - this.sidebar_items[this.current_page_name].removeClass("selected"); - this.sidebar_items[page].addClass("selected"); + let $item_container = this.sidebar_item_container(item); + let sidebar_control = $item_container.find('.sidebar-item-control'); + + this.add_sidebar_actions(item, sidebar_control); + let pages = item.public ? this.public_pages : this.private_pages; + + let child_items = pages.filter(page => page.parent_page == item.title); + if (child_items.length > 0) { + let child_container = $(``); + this.prepare_sidebar(child_items, child_container, $item_container); } - this.current_page_name = page; - localStorage.current_workspace = page; - this.pages[page] ? this.pages[page].show() : this.make_page(page); - this.current_page = this.pages[page]; - this.setup_dropdown(); - } + $item_container.appendTo(container); + this.sidebar_items[item.public ? 'public' : 'private'][item.title] = $item_container; - make_page(page) { - const $page = new DesktopPage({ - container: this.body, - page_name: page - }); + if ($item_container.parent().hasClass('hidden') && is_current_page) { + $item_container.parent().toggleClass('hidden'); + } - this.pages[page] = $page; - return $page; + this.add_drop_icon(item, sidebar_control, $item_container); } - customize() { - if (this.current_page && this.current_page.allow_customization) { - this.page.clear_menu(); - this.current_page.customize(); - - this.page.set_primary_action( - __("Save Customizations"), - () => { - this.current_page.save_customization(); - this.page.clear_primary_action(); - this.page.clear_secondary_action(); - this.setup_dropdown(); - }, - null, - __("Saving") - ); + add_drop_icon(item, sidebar_control, item_container) { + let $child_item_section = item_container.find('.sidebar-child-item'); + let $drop_icon = $(``) + .appendTo(sidebar_control); + let pages = item.public ? this.public_pages : this.private_pages; + if (pages.some(e => e.parent_page == item.title)) { + $drop_icon.removeClass('hidden'); + $drop_icon.on('click', () => { + let icon = $drop_icon.find("use").attr("href")==="#icon-small-down" ? "#icon-small-up" : "#icon-small-down"; + $drop_icon.find("use").attr("href", icon); + $child_item_section.toggleClass("hidden"); + }); + } + } - this.page.set_secondary_action( - __("Discard"), - () => { - this.current_page.reload(); - frappe.show_alert({ message: __("Customizations Discarded"), indicator: "info" }); - this.page.clear_primary_action(); - this.page.clear_secondary_action(); - this.setup_dropdown(); - } - ); + show() { + if (!this.all_pages) { + // pages not yet loaded, call again after a bit + setTimeout(() => this.show(), 100); + return; } + + let page = { + name: this.get_page_to_show().name, + public: this.get_page_to_show().public + } + this.page.set_title(`${__(page.name)}`); + + this.show_page(page); } - setup_dropdown() { - this.page.clear_menu(); + get_data(page) { + return frappe.xcall("frappe.desk.desktop.get_desktop_page", { + page: page + }).then(data => { + this.page_data = data; + if (!this.page_data || Object.keys(this.page_data).length === 0) return; - this.page.set_secondary_action(__('Customize'), () => { - this.customize(); + return frappe.dashboard_utils.get_dashboard_settings().then(settings => { + let chart_config = settings.chart_config ? JSON.parse(settings.chart_config) : {}; + if (this.page_data.charts && this.page_data.charts.items) { + this.page_data.charts.items.map(chart => { + chart.chart_settings = chart_config[chart.chart_name] || {}; + }); + } + }); }); + } - this.page.add_menu_item(__('Reset Customizations'), () => { - this.current_page.reset_customization(); - }, 1); + get_page_to_show() { + let default_page; - this.page.add_menu_item(__('Toggle Sidebar'), () => { - this.toggle_side_bar(); - }, 1); - } + if (localStorage.current_page) { + default_page = { name:localStorage.current_page, public:localStorage.is_current_page_public == 'true' }; + } else if (Object.keys(this.all_pages).length !== 0) { + default_page = { name:this.all_pages[0].title, public:true }; + } else { + default_page = { name:"Build", public:true }; + } - toggle_side_bar() { - let show_workspace_sidebar = JSON.parse(localStorage.show_workspace_sidebar || "true"); - show_workspace_sidebar = !show_workspace_sidebar; - localStorage.show_workspace_sidebar = show_workspace_sidebar; - this.show_or_hide_sidebar(); - $(document.body).trigger("toggleDeskSidebar"); + let page = (frappe.get_route()[1] == 'private' ? frappe.get_route()[2] : frappe.get_route()[1]) || default_page.name; + let is_public = frappe.get_route()[1] ? frappe.get_route()[1] != 'private' : default_page.public; + return { name:page, public:is_public }; } - show_or_hide_sidebar() { - let show_workspace_sidebar = JSON.parse(localStorage.show_workspace_sidebar || "true"); - $('#page-workspace .layout-side-section').toggleClass('hidden', !show_workspace_sidebar); - } -}; + show_page(page) { + let section = this.current_page.public ? 'public' : 'private'; + if (this.sidebar_items && this.sidebar_items[section] && this.sidebar_items[section][this.current_page.name]) { + this.sidebar_items[section][this.current_page.name][0].firstElementChild.classList.remove("selected"); + this.sidebar_items[page.public ? 'public':'private'][page.name][0].firstElementChild.classList.add("selected"); + + if (this.sidebar_items[page.public ? 'public':'private'][page.name].parents('.sidebar-item-container')[0]) { + this.sidebar_items[page.public ? 'public':'private'][page.name] + .parents('.sidebar-item-container') + .find('.drop-icon use') + .attr("href", "#icon-small-up"); + } + } -class DesktopPage { - constructor({ container, page_name }) { - frappe.desk_page = this; - this.container = container; - this.page_name = page_name; - this.sections = {}; - this.allow_customization = false; - this.reload(); - } + this.current_page = { name:page.name, public:page.public }; + localStorage.current_page = page.name; + localStorage.is_current_page_public = page.public; - show() { - frappe.desk_page = this; - this.page.show(); - if (this.sections.shortcuts) { - this.sections.shortcuts.widgets_list.forEach(wid => { - wid.set_actions(); + if (!this.body.find('#editorjs')[0]) { + this.$page = $(` +
+ `).appendTo(this.body); + } + this.$page.prepend(frappe.render_template('workspace_loading_skeleton')); + this.$page.find('.codex-editor').addClass('hidden'); + + if (this.all_pages) { + let pages = page.public ? this.public_pages : this.private_pages; + let this_page = pages.filter(p => p.title == page.name)[0]; + this.setup_actions(page); + this.content = this_page && JSON.parse(this_page.content); + $('.item-anchor').addClass('disable-click'); + this.get_data(this_page).then(() => { + this.prepare_editorjs(); + $('.item-anchor').removeClass('disable-click'); + this.$page.find('.codex-editor').removeClass('hidden'); + this.$page.find('.workspace-skeleton').remove(); }); } } - hide() { - this.page.hide(); + prepare_editorjs() { + if (this.editor) { + this.editor.isReady.then(() => { + this.editor.configuration.tools.chart.config.page_data = this.page_data; + this.editor.configuration.tools.shortcut.config.page_data = this.page_data; + this.editor.configuration.tools.card.config.page_data = this.page_data; + this.editor.render({ blocks: this.content || [] }); + }); + } else { + this.initialize_editorjs(this.content); + } } - reload() { - this.in_customize_mode = false; - this.page && this.page.remove(); - this.make(); + setup_actions(page) { + let pages = page.public ? this.public_pages : this.private_pages; + let current_page = pages.filter(p => p.title == page.name)[0]; + + if (!this.isReadOnly) { + this.setup_customization_buttons(current_page.is_editable); + return; + } + + this.page.clear_primary_action(); + this.page.clear_secondary_action(); + this.page.clear_inner_toolbar(); + + current_page.is_editable && this.page.set_secondary_action(__("Customize"), () => { + if (!this.editor || !this.editor.readOnly) return; + this.isReadOnly = false; + this.editor.readOnly.toggle(); + this.editor.isReady.then(() => { + this.initialize_editorjs_undo(); + this.setup_customization_buttons(true); + this.show_sidebar_actions(); + this.make_sidebar_sortable(); + this.make_blocks_sortable(); + }); + }); + + this.page.add_inner_button(__("Create Page"), () => { + this.initialize_new_page(); + }); } - make() { - this.page = $(`
`); - this.page.append(frappe.render_template('workspace_loading_skeleton')); - this.page.appendTo(this.container); + initialize_editorjs_undo() { + this.undo = new Undo({ editor: this.editor }); + this.undo.initialize({ blocks: this.content || [] }); + this.undo.readOnly = false; + } - this.get_data().then(() => { - if (Object.keys(this.data).length == 0) { - delete localStorage.current_workspace; - frappe.set_route("workspace"); - return; + setup_customization_buttons(is_editable) { + this.page.clear_primary_action(); + this.page.clear_secondary_action(); + this.page.clear_inner_toolbar(); + + is_editable && this.page.set_primary_action( + __("Save Customizations"), + () => { + this.page.clear_primary_action(); + this.page.clear_secondary_action(); + this.undo.readOnly = true; + this.save_page(); + this.editor.readOnly.toggle(); + this.isReadOnly = true; + }, + null, + __("Saving") + ); + + this.page.set_secondary_action( + __("Discard"), + () => { + this.page.clear_primary_action(); + this.page.clear_secondary_action(); + this.editor.readOnly.toggle(); + this.isReadOnly = true; + this.deleted_sidebar_items = []; + this.reload(); + frappe.show_alert({ message: __("Customizations Discarded"), indicator: "info" }); } - this.refresh(); - }).finally(this.page.find('.workspace_loading_skeleton').remove); + ); } - refresh() { - this.page.empty(); - this.allow_customization = this.data.allow_customization || false; + show_sidebar_actions() { + this.sidebar.find('.standard-sidebar-section').addClass('show-control'); + } - if (frappe.is_mobile()) { - this.allow_customization = false; + add_sidebar_actions(item, sidebar_control) { + if (!item.is_editable) { + $(`${frappe.utils.icon("lock", "sm")}`) + .appendTo(sidebar_control); + sidebar_control.find('.sidebar-info').click(() => { + frappe.show_alert({ + message: __("Only owner can sort of edit this page"), + indicator: 'info' + }, 5); + }); + } else { + frappe.utils.add_custom_button( + frappe.utils.icon('drag', 'xs'), + null, + "drag-handle", + `${__('Drag')}`, + null, + sidebar_control + ); + frappe.utils.add_custom_button( + frappe.utils.icon('delete', 'xs'), + () => this.delete_page(item), + "delete-page", + `${__('Delete')}`, + null, + sidebar_control + ); } - - this.data.onboarding && this.data.onboarding.items.length && this.make_onboarding(); - this.make_charts(); - this.make_shortcuts(); - this.make_cards(); } - get_data() { - return frappe.xcall("frappe.desk.desktop.get_desktop_page", { - page: this.page_name - }).then(data => { - this.data = data; - if (Object.keys(this.data).length == 0) return; + delete_page(item) { + frappe.confirm(__("Are you sure you want to delete page {0}?", [item.title]), () => { + this.deleted_sidebar_items.push(item); + this.sidebar.find(`.standard-sidebar-section [item-name="${item.title}"][item-public="${item.public}"]`).addClass('hidden'); + }); + } - return frappe.dashboard_utils.get_dashboard_settings().then(settings => { - let chart_config = settings.chart_config ? JSON.parse(settings.chart_config) : {}; - if (this.data.charts.items) { - this.data.charts.items.map(chart => { - chart.chart_settings = chart_config[chart.chart_name] || {}; - }); + make_sidebar_sortable() { + let me = this; + $('.nested-container').each( function() { + new Sortable(this, { + handle: ".drag-handle", + draggable: ".sidebar-item-container.is-draggable", + group: 'nested', + animation: 150, + fallbackOnBody: true, + swapThreshold: 0.65, + onEnd: function () { + me.prepare_sorted_sidebar(); } }); }); } - customize() { - if (this.in_customize_mode) { - return; + prepare_sorted_sidebar() { + this.sorted_sidebar_items = []; + for (let page of $('.standard-sidebar-section').find('.sidebar-item-container')) { + let parent_page = ""; + if (page.closest('.nested-container').classList.contains('sidebar-child-item')) { + parent_page = page.parentElement.parentElement.attributes["item-name"].value; + } + this.sorted_sidebar_items.push({ + title: page.attributes['item-name'].value, + parent_page: parent_page, + public: page.attributes['item-public'].value + }); } + } - // We need to remove this as the chart group will be visible during customization - $('.widget.onboarding-widget-box').hide(); - - Object.keys(this.sections).forEach(section => { - this.sections[section].customize(); + make_blocks_sortable() { + let me = this; + this.page_sortable = Sortable.create(this.page.main.find(".codex-editor__redactor").get(0), { + handle: ".drag-handle", + draggable: ".ce-block", + animation: 150, + onEnd: function (evt) { + me.editor.blocks.move(evt.newIndex, evt.oldIndex); + }, + setData: function () { + //Do Nothing + } }); - this.in_customize_mode = true; - } - save_customization() { - frappe.dom.freeze(); - const config = {}; - - if (this.sections.charts) config.charts = this.sections.charts.get_widget_config(); - if (this.sections.shortcuts) config.shortcuts = this.sections.shortcuts.get_widget_config(); - if (this.sections.cards) config.cards = this.sections.cards.get_widget_config(); - - frappe.call('frappe.desk.desktop.save_customization', { - page: this.page_name, - config: config - }).then(res => { - frappe.dom.unfreeze(); - if (res.message) { - frappe.show_alert({ message: __("Customizations Saved Successfully"), indicator: "green" }); - this.reload(); - } else { - frappe.throw({ message: __("Something went wrong while saving customizations"), indicator: "red" }); - this.reload(); + initialize_new_page() { + let parent_pages = this.private_pages.filter(page => !page.parent_page).map(page => page.title); + + if (this.has_access) { + parent_pages = this.all_pages.filter(page => !page.parent_page).map(page => page.title); + } + parent_pages.unshift(''); + const d = new frappe.ui.Dialog({ + title: __('Set Title'), + fields: [ + { + label: __('Title'), + fieldtype: 'Data', + fieldname: 'title', + reqd: 1 + }, + { + label: __('Parent'), + fieldtype: 'Select', + fieldname: 'parent', + options: parent_pages + }, + { + label: __('Public'), + fieldtype: 'Check', + fieldname: 'is_public', + depends_on: `eval:${this.has_access}` + } + ], + primary_action_label: __('Create'), + primary_action: (values) => { + if (!this.validate_page(values)) return; + d.hide(); + this.initialize_editorjs_undo(); + this.setup_customization_buttons(true); + this.title = values.title; + this.parent = values.parent; + this.public = values.is_public; + this.editor.render({ + blocks: [ + { + type: "header", + data: { + text: this.title, + level: 4 + } + } + ] + }).then(() => { + if (this.editor.configuration.readOnly) { + this.isReadOnly = false; + this.editor.readOnly.toggle(); + } + this.add_page_to_sidebar(values); + this.show_sidebar_actions(); + this.make_sidebar_sortable(); + this.make_blocks_sortable(); + this.prepare_sorted_sidebar(); + }); } }); + d.show(); } - reset_customization() { - frappe.call('frappe.desk.desktop.reset_customization', { - page: this.page_name - }).then(() => { - frappe.show_alert({ message: __("Removed page customizations"), indicator: "green" }); - this.reload(); - }); + validate_page(values) { + let message = ""; + let pages = values.is_public ? this.public_pages : this.private_pages; + + if (pages && pages.filter(p => p.title == values.title)[0]) { + message = "Page with title '{0}' already exist."; + } else if (frappe.router.doctype_route_exist(frappe.router.slug(values.title))) { + message = "Doctype with same route already exist. Please choose different title."; + } + + if (message) { + frappe.throw(__(message, [__(values.title)])); + return false; + } + return true; } - make_onboarding() { - this.onboarding_widget = frappe.widget.make_widget({ - label: this.data.onboarding.label || __("Let's Get Started"), - subtitle: this.data.onboarding.subtitle, - steps: this.data.onboarding.items, - success: this.data.onboarding.success, - docs_url: this.data.onboarding.docs_url, - user_can_dismiss: this.data.onboarding.user_can_dismiss, - widget_type: 'onboarding', - container: this.page, - options: { - allow_sorting: false, - allow_create: false, - allow_delete: false, - allow_hiding: false, - allow_edit: false, - max_widget_count: 2, + add_page_to_sidebar({title, parent, is_public}) { + let $sidebar = $('.standard-sidebar-section'); + let item = { + title: title, + parent_page: parent, + public: is_public + }; + let $sidebar_item = this.sidebar_item_container(item); + $sidebar_item.addClass('is-draggable'); + + frappe.utils.add_custom_button( + frappe.utils.icon('drag', 'xs'), + null, + "drag-handle", + `${__('Drag')}`, + null, + $sidebar_item.find('.sidebar-item-control') + ); + $sidebar_item.find('.sidebar-item-control .drag-handle').css('margin-right', '8px'); + + if (!parent) { + if (is_public) { + $sidebar_item.appendTo($sidebar[0]); + } else { + $sidebar.last().removeClass('hidden'); + $sidebar_item.appendTo($sidebar[1]); } - }); + } else { + let $item_container = $sidebar.find(`[item-name="${parent}"]`); + let $child_section = $item_container.find('.sidebar-child-item'); + let $drop_icon = $item_container.find('.drop-icon'); + if (!$child_section[0]) { + $child_section = $(``) + .appendTo($item_container); + $drop_icon.toggleClass('hidden'); + } + $sidebar_item.appendTo($child_section); + $child_section.removeClass('hidden'); + $item_container.find('.drop-icon use').attr("href", "#icon-small-up"); + } + this.make_sidebar_sortable(); } - make_charts() { - this.sections["charts"] = new frappe.widget.WidgetGroup({ - container: this.page, - type: "chart", - columns: 1, - class_name: "widget-charts", - hidden: Boolean(this.onboarding_widget), - options: { - allow_sorting: this.allow_customization, - allow_create: this.allow_customization, - allow_delete: this.allow_customization, - allow_hiding: false, - allow_edit: true, - max_widget_count: 2, + initialize_editorjs(blocks) { + this.editor = new EditorJS({ + data: { + blocks: blocks || [] }, - widgets: this.data.charts.items + tools: this.tools, + autofocus: false, + tunes: ['spacingTune'], + readOnly: true, + logLevel: 'ERROR' }); } - make_shortcuts() { - this.sections["shortcuts"] = new frappe.widget.WidgetGroup({ - title: this.data.shortcuts.label || __('Your Shortcuts'), - container: this.page, - type: "shortcut", - columns: 3, - options: { - allow_sorting: this.allow_customization, - allow_create: this.allow_customization, - allow_delete: this.allow_customization, - allow_hiding: false, - allow_edit: true, - }, - widgets: this.data.shortcuts.items - }); - } + save_page() { + frappe.dom.freeze(); + let save = true; + if (!this.title && this.current_page) { + let pages = this.current_page.public ? this.public_pages : this.private_pages; + this.title = this.current_page.name; + this.public = pages.filter(p => p.title == this.title)[0].public; + save = false; + } else { + this.current_page = { name: this.title, public: this.public }; + } + let me = this; + this.editor.save().then((outputData) => { + let new_widgets = {}; + outputData.blocks.forEach(item => { + if (item.data.new) { + if (!new_widgets[item.type]) { + new_widgets[item.type] = []; + } + new_widgets[item.type].push(item.data.new); + delete item.data['new']; + } + }); - make_cards() { - let cards = new frappe.widget.WidgetGroup({ - title: this.data.cards.label || __("Reports & Masters"), - container: this.page, - type: "links", - columns: 3, - options: { - allow_sorting: this.allow_customization, - allow_create: false, - allow_delete: false, - allow_hiding: this.allow_customization, - allow_edit: false, - }, - widgets: this.data.cards.items + frappe.call({ + method: "frappe.desk.doctype.workspace.workspace.save_page", + args: { + title: me.title, + parent: me.parent || '', + public: me.public || 0, + sb_items: me.sorted_sidebar_items, + deleted_pages: me.deleted_sidebar_items, + new_widgets: new_widgets, + blocks: JSON.stringify(outputData.blocks), + save: save + }, + callback: function(res) { + frappe.dom.unfreeze(); + if (res.message) { + frappe.show_alert({ message: __("Page Saved Successfully"), indicator: "green" }); + me.new_page = res.message; + me.title = ''; + me.parent = ''; + me.public = false; + me.sorted_sidebar_items = []; + me.deleted_sidebar_items = []; + me.reload(); + } + } + }); + }).catch((error) => { + error; + // console.log('Saving failed: ', error); }); - - this.sections["cards"] = cards; } -} - + reload() { + this.setup_pages(); + this.undo.readOnly = true; + } +}; \ No newline at end of file diff --git a/frappe/public/js/frappe/wiki_blocks/blocks.js b/frappe/public/js/frappe/wiki_blocks/blocks.js deleted file mode 100644 index dc69db66ca..0000000000 --- a/frappe/public/js/frappe/wiki_blocks/blocks.js +++ /dev/null @@ -1,25 +0,0 @@ -// import blocks -import Header from "../wiki_blocks/header"; -import Paragraph from "../wiki_blocks/paragraph"; -import Card from "../wiki_blocks/card"; -import Chart from "../wiki_blocks/chart"; -import Shortcut from "../wiki_blocks/shortcut"; -import Spacer from "../wiki_blocks/spacer"; - -// import tunes -import SpacingTune from "../wiki_blocks/spacing_tune"; - -frappe.provide("frappe.wiki_block"); - -frappe.wiki_block.blocks = { - header: Header, - paragraph: Paragraph, - card: Card, - chart: Chart, - shortcut: Shortcut, - spacer: Spacer, -}; - -frappe.wiki_block.tunes = { - spacing_tune: SpacingTune -}; \ No newline at end of file diff --git a/frappe/public/scss/desk/desktop.scss b/frappe/public/scss/desk/desktop.scss index ac3b1a4f7c..8644310e52 100644 --- a/frappe/public/scss/desk/desktop.scss +++ b/frappe/public/scss/desk/desktop.scss @@ -9,6 +9,11 @@ body { .standard-sidebar-label { font-size: var(--text-xs); text-transform: uppercase; + cursor: pointer; + + span { + pointer-events: none; + } } .standard-sidebar-section { @@ -781,4 +786,248 @@ body { } } } + + .standard-sidebar-item { + justify-content: space-between; + padding: 0px; + + .sidebar-item-control { + + > * { + align-self: center; + margin-left: 3px; + box-shadow: none; + } + + .drag-handle { + cursor: all-scroll; + cursor: -webkit-grabbing; + display: none; + } + + .delete-page { + display: none; + } + + .drop-icon { + padding: 10px 12px 10px 2px; + } + + .sidebar-info { + display: none; + } + + svg { + margin-right: 0; + } + } + + .sidebar-item-label { + flex: 1; + } + + .item-anchor { + display: flex; + overflow: hidden; + padding: 8px 0px 8px 12px; + flex: 1; + } + } + + .sidebar-item-container { + .sidebar-item-container{ + margin-left: 10px; + + .standard-sidebar-item { + justify-content: start; + } + } + } + + .standard-sidebar-section.show-control { + .desk-sidebar-item.standard-sidebar-item { + + &:hover, &.selected { + .drag-handle { + display: inline-block; + } + + .delete-page { + display: inline-block; + margin-right: 8px; + } + + .sidebar-info { + display: inline-block; + margin-right: 8px; + } + + .drop-icon { + padding: 10px 8px 10px 2px; + margin-left: -4px; + } + } + + .block-click { + pointer-events:none; + } + } + } + + .codex-editor { + min-height: 630px; + + .codex-editor__redactor{ + display: flex; + flex-wrap: wrap; + flex-direction: row; + margin: 0px -7px; + padding-bottom: 20px !important; + + .ce-block{ + width: 100%; + padding-left: 0; + padding-right: 0; + + &.ce-block--selected { + .ce-block__content { + background-color: inherit; + } + } + + .ce-block__content { + max-width: 100%; + height: 100%; + padding: 7px; + + &> div { + height: 100%; + } + + .tune-btn > * { + pointer-events: none; + } + + .ce-header { + padding: 0 !important; + margin-bottom: 0 !important; + flex: 1; + } + + .widget{ + &.header { + display: flex; + justify-content: center; + flex: 1; + padding-left: 15px !important; + padding-right: 15px !important; + min-height: 50px; + box-shadow: none; + background-color: var(--control-bg); + color: var(--text-muted); + } + + &:focus { + outline: none; + } + + &.new-widget { + align-items: inherit; + } + + .paragraph-control { + display: flex; + flex-direction: row-reverse; + position: absolute; + right: 20px; + gap: 5px; + background-color: var(--card-bg); + padding-left: 5px; + + .drag-handle { + cursor: all-scroll; + cursor: -webkit-grabbing; + } + } + } + } + } + } + + svg { + fill: none; + } + + .ce-toolbar { + svg { + fill: currentColor; + } + + .icon { + stroke: none; + width: fit-content; + } + + .ce-settings { + width: fit-content; + + .cdx-settings-button.disabled{ + pointer-events: none; + opacity: .5 + } + .cdx-settings-sidebar{ + position: absolute; + right: 100%; + top:0; + background: #fff; + width: 108px; + height: 145px; + box-shadow: 0 3px 15px -3px rgba(13,20,33,.13); + border-radius: 0 4px 4px 0;z-index: 0; + } + } + + .ce-toolbar__settings-btn { + display: none; + } + } + + .ce-inline-tool, .ce-inline-toolbar__dropdown { + .icon { + fill: currentColor; + } + } + + @media (min-width: 1199px) { + .ce-toolbar__content { + max-width: 930px; + } + } + @media (max-width: 995px) { + .ce-toolbar__content { + max-width: 760px; + } + } + + @media (max-width: 1199px) { + .ce-block.col-4 { + flex: 0 0 50%; + max-width: 50%; + } + } + + @media (max-width: 750px) { + .ce-block.col-4 { + flex: 0 0 100%; + max-width: 100%; + } + } + @media (max-width: 750px) { + .ce-block.col-6 { + flex: 0 0 100%; + max-width: 100%; + } + } + + } } diff --git a/frappe/public/scss/desk/index.scss b/frappe/public/scss/desk/index.scss index 446aa25d20..c5b8271a36 100644 --- a/frappe/public/scss/desk/index.scss +++ b/frappe/public/scss/desk/index.scss @@ -25,7 +25,6 @@ @import "notification"; @import "global_search"; @import "desktop"; -@import "wiki"; @import "../common/awesomeplete"; @import "sidebar"; @import "filters"; diff --git a/frappe/public/scss/desk/wiki.scss b/frappe/public/scss/desk/wiki.scss deleted file mode 100644 index 517e2a8182..0000000000 --- a/frappe/public/scss/desk/wiki.scss +++ /dev/null @@ -1,274 +0,0 @@ -[data-page-route="wiki"] { - @media (min-width: map-get($grid-breakpoints, "lg")) { - .layout-main { - height: calc(100vh - var(--navbar-height) - var(--page-head-height) - 5px); - .layout-side-section, .layout-main-section-wrapper { - height: 100%; - overflow-y: auto; - padding-right: 25px; - scrollbar-color: var(--gray-200) transparent; - [data-theme="dark"] & { - scrollbar-color: var(--gray-800) transparent; - } - - &::-webkit-scrollbar-track { - background: transparent; - } - - &::-webkit-scrollbar-thumb { - background: var(--gray-200); - [data-theme="dark"] & { - background: var(--gray-800); - } - } - } - - .desk-sidebar { - margin-bottom: var(--margin-2xl); - } - } - } - - .standard-sidebar-item { - justify-content: space-between; - padding: 0px; - - .sidebar-item-control { - - > * { - align-self: center; - margin-left: 3px; - box-shadow: none; - } - - .drag-handle { - cursor: all-scroll; - cursor: -webkit-grabbing; - display: none; - } - - .delete-page { - display: none; - } - - .drop-icon { - padding: 10px 12px 10px 2px; - } - - .sidebar-info { - display: none; - } - - svg { - margin-right: 0; - } - } - - .sidebar-item-label { - flex: 1; - } - - .item-anchor { - display: flex; - overflow: hidden; - padding: 8px 0px 8px 12px; - flex: 1; - } - } - - .sidebar-item-container { - .sidebar-item-container{ - margin-left: 10px; - - .standard-sidebar-item { - justify-content: start; - } - } - } - - .standard-sidebar-section.show-control { - .desk-sidebar-item.standard-sidebar-item { - - &:hover, &.selected { - .drag-handle { - display: inline-block; - } - - .delete-page { - display: inline-block; - margin-right: 8px; - } - - .sidebar-info { - display: inline-block; - } - - .drop-icon { - padding: 10px 8px 10px 2px; - margin-left: -4px; - } - } - - .block-click { - pointer-events:none; - } - } - } -} - -.codex-editor { - min-height: 630px; - - .codex-editor__redactor{ - display: flex; - flex-wrap: wrap; - flex-direction: row; - margin: 0px -7px; - padding-bottom: 20px !important; - - .ce-block{ - width: 100%; - padding-left: 0; - padding-right: 0; - - &.ce-block--selected { - .ce-block__content { - background-color: inherit; - } - } - - .ce-block__content { - max-width: 100%; - height: 100%; - padding: 7px; - - &> div { - height: 100%; - } - - .tune-btn > * { - pointer-events: none; - } - - .ce-header { - padding: 0 !important; - margin-bottom: 0 !important; - flex: 1; - } - - .widget{ - &.header { - display: flex; - justify-content: center; - flex: 1; - padding-left: 15px !important; - padding-right: 15px !important; - min-height: 50px; - box-shadow: none; - background-color: var(--control-bg); - color: var(--text-muted); - } - - &:focus { - outline: none; - } - - &.new-widget { - align-items: inherit; - } - - .paragraph-control { - display: flex; - flex-direction: row-reverse; - position: absolute; - right: 20px; - gap: 5px; - background-color: var(--card-bg); - padding-left: 5px; - - .drag-handle { - cursor: all-scroll; - cursor: -webkit-grabbing; - } - } - } - } - } - } - - svg { - fill: none; - } - - .ce-toolbar { - svg { - fill: currentColor; - } - - .icon { - stroke: none; - width: fit-content; - } - - .ce-settings { - width: fit-content; - - .cdx-settings-button.disabled{ - pointer-events: none; - opacity: .5 - } - .cdx-settings-sidebar{ - position: absolute; - right: 100%; - top:0; - background: #fff; - width: 108px; - height: 145px; - box-shadow: 0 3px 15px -3px rgba(13,20,33,.13); - border-radius: 0 4px 4px 0;z-index: 0; - } - } - - .ce-toolbar__settings-btn { - display: none; - } - } - - .ce-inline-tool, .ce-inline-toolbar__dropdown { - .icon { - fill: currentColor; - } - } - - @media (min-width: 1199px) { - .ce-toolbar__content { - max-width: 930px; - } - } - @media (max-width: 995px) { - .ce-toolbar__content { - max-width: 760px; - } - } - - @media (max-width: 1199px) { - .ce-block.col-4 { - flex: 0 0 50%; - max-width: 50%; - } - } - - @media (max-width: 750px) { - .ce-block.col-4 { - flex: 0 0 100%; - max-width: 100%; - } - } - @media (max-width: 750px) { - .ce-block.col-6 { - flex: 0 0 100%; - max-width: 100%; - } - } - -} \ No newline at end of file From dd39b539a971b82d44639b5b05cf8cb55a3afe75 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 7 Jul 2021 10:33:26 +0530 Subject: [PATCH 053/306] fix: sider fix --- frappe/desk/doctype/workspace/workspace.py | 22 ++++++++----------- frappe/patches/v13_0/update_workspace.py | 3 +-- frappe/public/js/frappe/router.js | 2 +- frappe/public/js/frappe/utils/utils.js | 2 +- .../js/frappe/views/workspace/workspace.js | 20 ++++++++--------- 5 files changed, 22 insertions(+), 27 deletions(-) diff --git a/frappe/desk/doctype/workspace/workspace.py b/frappe/desk/doctype/workspace/workspace.py index ed542a0fd2..4eede2211e 100644 --- a/frappe/desk/doctype/workspace/workspace.py +++ b/frappe/desk/doctype/workspace/workspace.py @@ -163,13 +163,13 @@ def get_pages(): has_access = "System Manager" in frappe.get_roles() fields = ['name', 'title', 'icon', 'public', 'parent_page', 'content'] - pages = get_page_list(fields, { 'public': 1 }) - private_pages = get_page_list(fields, { 'for_user': frappe.session.user }) + pages = get_page_list(fields, {'public': 1}) + private_pages = get_page_list(fields, {'for_user': frappe.session.user}) if private_pages: pages.extend(private_pages) - return { 'pages': pages, 'has_access': has_access } + return {'pages': pages, 'has_access': has_access} @frappe.whitelist() def save_page(title, parent, public, sb_items, deleted_pages, new_widgets, blocks, save): @@ -215,24 +215,24 @@ def save_page(title, parent, public, sb_items, deleted_pages, new_widgets, block if json.loads(deleted_pages): return delete_pages(json.loads(deleted_pages)) - return { "name": title, "public": public } + return {"name": title, "public": public} def delete_pages(deleted_pages): for page in deleted_pages: if page.get("public") and "System Manager" not in frappe.get_roles(): - return { "name": page.get("title"), "public": 1 } + return {"name": page.get("title"), "public": 1} if frappe.db.exists("Workspace", page.get("name")): frappe.get_doc("Workspace", page.get("name")).delete(ignore_permissions=True) - return { "name": "Home", "public": 1 } + return {"name": "Home", "public": 1} def sort_pages(sb_items): public_pages = [page for page in sb_items if page.get('public')=='1'] private_pages = [page for page in sb_items if page.get('public')=='0'] - wspace_public_pages = get_page_list(['name', 'title'], { 'public': 1 }) - wspace_private_pages = get_page_list(['name', 'title'], { 'for_user': frappe.session.user }) + wspace_public_pages = get_page_list(['name', 'title'], {'public': 1}) + wspace_private_pages = get_page_list(['name', 'title'], {'for_user': frappe.session.user}) sort_page(wspace_private_pages, private_pages) @@ -250,8 +250,4 @@ def sort_page(wspace_pages, pages): break def get_page_list(fields, filters): - return frappe.get_list("Workspace", - fields=fields, - filters=filters, - order_by='sequence_id asc' - ) + return frappe.get_list("Workspace", fields=fields, filters=filters, order_by='sequence_id asc') diff --git a/frappe/patches/v13_0/update_workspace.py b/frappe/patches/v13_0/update_workspace.py index 6175184716..737e151796 100644 --- a/frappe/patches/v13_0/update_workspace.py +++ b/frappe/patches/v13_0/update_workspace.py @@ -1,11 +1,10 @@ -from hashlib import new import frappe import json from frappe import _ def execute(): frappe.reload_doc('desk', 'doctype', 'workspace', force=True) - order_by = "pin_to_top desc, pin_to_bottom asc, name asc" + order_by = "is_standard asc, pin_to_top desc, pin_to_bottom asc, name asc" for seq, wspace in enumerate(frappe.get_all('Workspace', order_by=order_by)): doc = frappe.get_doc('Workspace', wspace.name) content = create_content(doc) diff --git a/frappe/public/js/frappe/router.js b/frappe/public/js/frappe/router.js index 0781127071..dd2cbb430c 100644 --- a/frappe/public/js/frappe/router.js +++ b/frappe/public/js/frappe/router.js @@ -143,7 +143,7 @@ frappe.router = { doctype_route_exist(route) { route = this.get_sub_path_string(route).split('/'); - return this.routes[route[0]] + return this.routes[route[0]]; }, set_doctype_route(route) { diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js index a366ca15a3..36dac31184 100644 --- a/frappe/public/js/frappe/utils/utils.js +++ b/frappe/public/js/frappe/utils/utils.js @@ -1334,7 +1334,7 @@ Object.assign(frappe.utils, { }); !prepend && button.appendTo(wrapper); prepend && wrapper.prepend(button); - }, + }, sleep(time) { return new Promise((resolve) => setTimeout(resolve, time)); diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index 8a4f49a8a3..5d07d5e453 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -27,7 +27,7 @@ frappe.views.Workspace = class Workspace { this.sidebar_items = { 'public': {}, 'private': {} - } + }; this.sidebar_categories = [ "Public", frappe.user.first_name() @@ -96,11 +96,11 @@ frappe.views.Workspace = class Workspace { } if (this.new_page && this.new_page.name) { if (!frappe.workspaces[frappe.router.slug(this.new_page.name)]) { - this.new_page = { name:this.all_pages[0].title, public:this.all_pages[0].public }; + this.new_page = { name: this.all_pages[0].title, public: this.all_pages[0].public }; } if (this.new_page.public) { frappe.set_route(`${frappe.router.slug(this.new_page.name)}`); - } else{ + } else { frappe.set_route(`private/${frappe.router.slug(this.new_page.name)}`); } this.new_page = null; @@ -159,7 +159,7 @@ frappe.views.Workspace = class Workspace { let icon = $(e.target).find("span use").attr("href")==="#icon-small-down" ? "#icon-right" : "#icon-small-down"; $(e.target).find("span use").attr("href", icon); $(e.target).parent().find('.sidebar-item-container').toggleClass('hidden'); - }) + }); if (Object.keys(root_pages).length === 0) { sidebar_section.addClass('hidden'); @@ -226,7 +226,7 @@ frappe.views.Workspace = class Workspace { let page = { name: this.get_page_to_show().name, public: this.get_page_to_show().public - } + }; this.page.set_title(`${__(page.name)}`); this.show_page(page); @@ -254,16 +254,16 @@ frappe.views.Workspace = class Workspace { let default_page; if (localStorage.current_page) { - default_page = { name:localStorage.current_page, public:localStorage.is_current_page_public == 'true' }; + default_page = { name: localStorage.current_page, public: localStorage.is_current_page_public == 'true' }; } else if (Object.keys(this.all_pages).length !== 0) { - default_page = { name:this.all_pages[0].title, public:true }; + default_page = { name: this.all_pages[0].title, public: true }; } else { - default_page = { name:"Build", public:true }; + default_page = { name: "Build", public: true }; } let page = (frappe.get_route()[1] == 'private' ? frappe.get_route()[2] : frappe.get_route()[1]) || default_page.name; let is_public = frappe.get_route()[1] ? frappe.get_route()[1] != 'private' : default_page.public; - return { name:page, public:is_public }; + return { name: page, public: is_public }; } show_page(page) { @@ -280,7 +280,7 @@ frappe.views.Workspace = class Workspace { } } - this.current_page = { name:page.name, public:page.public }; + this.current_page = { name: page.name, public: page.public }; localStorage.current_page = page.name; localStorage.is_current_page_public = page.public; From bda2a26528458baa7f25127253d55018dc030f48 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 7 Jul 2021 12:01:33 +0530 Subject: [PATCH 054/306] fix: Updated patch --- frappe/patches/v13_0/update_workspace.py | 40 ++++++++++++++---------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/frappe/patches/v13_0/update_workspace.py b/frappe/patches/v13_0/update_workspace.py index 737e151796..d8fcabce50 100644 --- a/frappe/patches/v13_0/update_workspace.py +++ b/frappe/patches/v13_0/update_workspace.py @@ -8,7 +8,7 @@ def execute(): for seq, wspace in enumerate(frappe.get_all('Workspace', order_by=order_by)): doc = frappe.get_doc('Workspace', wspace.name) content = create_content(doc) - create_wspace_copy(doc, seq, content) + update_wspace(doc, seq, content) frappe.db.commit() def create_content(doc): @@ -29,20 +29,28 @@ def create_content(doc): content.append({"type":"card","data":{"card_name":l.label,"col":4,"pt":0,"pr":0,"pb":0,"pl":0}}) return content -def create_wspace_copy(doc, seq, content): - new_doc = frappe.new_doc('Workspace') - new_doc.content = json.dumps(content) - new_doc.sequence_id = seq + 1 - new_doc.charts = doc.charts or [] - new_doc.shortcuts = doc.shortcuts or [] - new_doc.links = doc.links or [] - new_doc.label = doc.label - new_doc.icon = doc.icon +def update_wspace(doc, seq, content): + doc.sequence_id = seq + 1 + doc.content = json.dumps(content) if doc.is_standard: - new_doc.public = 1 - new_doc.title = doc.label + doc.public = 1 + doc.for_user = '' + doc.title = doc.label else: - new_doc.for_user = doc.for_user - new_doc.title = doc.extends - doc.delete() - new_doc.insert() \ No newline at end of file + doc.public = 0 + doc.for_user = doc.for_user + doc.title = doc.extends + doc.extends = '' + doc.module = '' + doc.category = '' + doc.restrict_to_domain = '' + doc.onboarding = '' + doc.extends_another_page = 0 + doc.is_default = 0 + doc.is_standard = 0 + doc.developer_mode_only = 0 + doc.disable_user_customization = 0 + doc.pin_to_top = 0 + doc.pin_to_bottom = 0 + doc.hide_custom = 0 + doc.save() \ No newline at end of file From f052af56636b0be09f3ddebf2178c64a30eb8b4e Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 7 Jul 2021 14:38:48 +0530 Subject: [PATCH 055/306] fix: updated patch to remove invalid links --- frappe/patches/v13_0/update_workspace.py | 15 +++++++++++++++ .../public/js/frappe/views/workspace/workspace.js | 1 + 2 files changed, 16 insertions(+) diff --git a/frappe/patches/v13_0/update_workspace.py b/frappe/patches/v13_0/update_workspace.py index d8fcabce50..c93e4e230a 100644 --- a/frappe/patches/v13_0/update_workspace.py +++ b/frappe/patches/v13_0/update_workspace.py @@ -14,19 +14,34 @@ def execute(): def create_content(doc): content = [] if doc.charts: + invalid_links = [] for c in doc.charts: content.append({"type":"chart","data":{"chart_name":c.label,"col":12,"pt":0,"pr":0,"pb":0,"pl":0}}) + if c.get_invalid_links()[0]: + invalid_links.append(c) + for l in invalid_links: + del doc.charts[doc.charts.index(l)] if doc.shortcuts: + invalid_links = [] content.append({"type":"spacer","data":{"col":12,"pt":0,"pr":0,"pb":0,"pl":0}}) content.append({"type":"header","data":{"text":doc.shortcuts_label or _("Your Shortcuts"),"level":4,"col":12,"pt":0,"pr":0,"pb":0,"pl":0}}) for s in doc.shortcuts: content.append({"type":"shortcut","data":{"shortcut_name":s.label,"col":4,"pt":0,"pr":0,"pb":0,"pl":0}}) + if s.get_invalid_links()[0]: + invalid_links.append(s) + for l in invalid_links: + del doc.shortcuts[doc.shortcuts.index(l)] if doc.links: + invalid_links = [] content.append({"type":"spacer","data":{"col":12,"pt":0,"pr":0,"pb":0,"pl":0}}) content.append({"type":"header","data":{"text":doc.cards_label or _("Reports & Masters"),"level":4,"col":12,"pt":0,"pr":0,"pb":0,"pl":0}}) for l in doc.links: if l.type == 'Card Break': content.append({"type":"card","data":{"card_name":l.label,"col":4,"pt":0,"pr":0,"pb":0,"pl":0}}) + if l.get_invalid_links()[0]: + invalid_links.append(l) + for l in invalid_links: + del doc.links[doc.links.index(l)] return content def update_wspace(doc, seq, content): diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index 5d07d5e453..2bc21060bd 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -24,6 +24,7 @@ frappe.views.Workspace = class Workspace { this.new_page = null; this.sorted_sidebar_items = []; this.deleted_sidebar_items = []; + this.current_page = {}; this.sidebar_items = { 'public': {}, 'private': {} From 8cfe63f32ef901df9c9d4515046722f268d6888b Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 7 Jul 2021 15:05:05 +0530 Subject: [PATCH 056/306] fix: updated patch --- frappe/patches/v13_0/update_workspace.py | 42 ++++++++++-------------- 1 file changed, 18 insertions(+), 24 deletions(-) diff --git a/frappe/patches/v13_0/update_workspace.py b/frappe/patches/v13_0/update_workspace.py index c93e4e230a..89eaef8fb2 100644 --- a/frappe/patches/v13_0/update_workspace.py +++ b/frappe/patches/v13_0/update_workspace.py @@ -16,9 +16,10 @@ def create_content(doc): if doc.charts: invalid_links = [] for c in doc.charts: - content.append({"type":"chart","data":{"chart_name":c.label,"col":12,"pt":0,"pr":0,"pb":0,"pl":0}}) if c.get_invalid_links()[0]: invalid_links.append(c) + else: + content.append({"type":"chart","data":{"chart_name":c.label,"col":12,"pt":0,"pr":0,"pb":0,"pl":0}}) for l in invalid_links: del doc.charts[doc.charts.index(l)] if doc.shortcuts: @@ -26,9 +27,10 @@ def create_content(doc): content.append({"type":"spacer","data":{"col":12,"pt":0,"pr":0,"pb":0,"pl":0}}) content.append({"type":"header","data":{"text":doc.shortcuts_label or _("Your Shortcuts"),"level":4,"col":12,"pt":0,"pr":0,"pb":0,"pl":0}}) for s in doc.shortcuts: - content.append({"type":"shortcut","data":{"shortcut_name":s.label,"col":4,"pt":0,"pr":0,"pb":0,"pl":0}}) if s.get_invalid_links()[0]: invalid_links.append(s) + else: + content.append({"type":"shortcut","data":{"shortcut_name":s.label,"col":4,"pt":0,"pr":0,"pb":0,"pl":0}}) for l in invalid_links: del doc.shortcuts[doc.shortcuts.index(l)] if doc.links: @@ -45,27 +47,19 @@ def create_content(doc): return content def update_wspace(doc, seq, content): - doc.sequence_id = seq + 1 - doc.content = json.dumps(content) + new_doc = frappe.new_doc('Workspace') + new_doc.label = doc.label + new_doc.icon = doc.icon + new_doc.sequence_id = seq + 1 + new_doc.content = json.dumps(content) + new_doc.charts = doc.charts or [] + new_doc.shortcuts = doc.shortcuts or [] + new_doc.links = doc.links or [] if doc.is_standard: - doc.public = 1 - doc.for_user = '' - doc.title = doc.label + new_doc.public = 1 + new_doc.title = doc.label else: - doc.public = 0 - doc.for_user = doc.for_user - doc.title = doc.extends - doc.extends = '' - doc.module = '' - doc.category = '' - doc.restrict_to_domain = '' - doc.onboarding = '' - doc.extends_another_page = 0 - doc.is_default = 0 - doc.is_standard = 0 - doc.developer_mode_only = 0 - doc.disable_user_customization = 0 - doc.pin_to_top = 0 - doc.pin_to_bottom = 0 - doc.hide_custom = 0 - doc.save() \ No newline at end of file + new_doc.for_user = doc.for_user + new_doc.title = doc.extends + doc.delete() + new_doc.save() \ No newline at end of file From 7454c455a82c88e57028fd4cf64463c9eceb80df Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 7 Jul 2021 15:26:20 +0530 Subject: [PATCH 057/306] fix: updated patch name --- frappe/patches.txt | 2 +- .../v13_0/{update_workspace.py => update_workspace2_0.py} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename frappe/patches/v13_0/{update_workspace.py => update_workspace2_0.py} (100%) diff --git a/frappe/patches.txt b/frappe/patches.txt index 0d46a2e3dd..1287dfb990 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -180,4 +180,4 @@ frappe.patches.v12_0.rename_uploaded_files_with_proper_name frappe.patches.v13_0.queryreport_columns frappe.patches.v13_0.jinja_hook frappe.patches.v13_0.update_notification_channel_if_empty -frappe.patches.v13_0.update_workspace +frappe.patches.v13_0.update_workspace2_0 diff --git a/frappe/patches/v13_0/update_workspace.py b/frappe/patches/v13_0/update_workspace2_0.py similarity index 100% rename from frappe/patches/v13_0/update_workspace.py rename to frappe/patches/v13_0/update_workspace2_0.py From b0ef6328e72265f31a881f5ba72c293b139ce99b Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 7 Jul 2021 16:32:31 +0530 Subject: [PATCH 058/306] fix: updated patch name --- frappe/patches.txt | 2 +- .../v13_0/{update_workspace2_0.py => update_workspace2.py} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename frappe/patches/v13_0/{update_workspace2_0.py => update_workspace2.py} (96%) diff --git a/frappe/patches.txt b/frappe/patches.txt index 1287dfb990..e03b28e494 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -180,4 +180,4 @@ frappe.patches.v12_0.rename_uploaded_files_with_proper_name frappe.patches.v13_0.queryreport_columns frappe.patches.v13_0.jinja_hook frappe.patches.v13_0.update_notification_channel_if_empty -frappe.patches.v13_0.update_workspace2_0 +frappe.patches.v13_0.update_workspace2 diff --git a/frappe/patches/v13_0/update_workspace2_0.py b/frappe/patches/v13_0/update_workspace2.py similarity index 96% rename from frappe/patches/v13_0/update_workspace2_0.py rename to frappe/patches/v13_0/update_workspace2.py index 89eaef8fb2..4fecfb2769 100644 --- a/frappe/patches/v13_0/update_workspace2_0.py +++ b/frappe/patches/v13_0/update_workspace2.py @@ -61,5 +61,5 @@ def update_wspace(doc, seq, content): else: new_doc.for_user = doc.for_user new_doc.title = doc.extends - doc.delete() - new_doc.save() \ No newline at end of file + frappe.delete_doc("Workspace", doc.name, force=1) + new_doc.insert(ignore_permissions=True) \ No newline at end of file From f2a91f5709ed4cbe6c4ae83c82b840cf746a5e14 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 8 Jul 2021 15:37:01 +0530 Subject: [PATCH 059/306] fix: updated wspace json files --- frappe/automation/workspace/tools/tools.json | 36 ++++++++++-- frappe/core/workspace/build/build.json | 33 +++++++++-- frappe/core/workspace/settings/settings.json | 55 +++++++++++++++++-- frappe/core/workspace/users/users.json | 29 ++++++++-- .../customization/customization.json | 27 +++++++-- .../workspace/integrations/integrations.json | 53 +++++++++++++----- frappe/website/workspace/website/website.json | 45 +++++++++++---- 7 files changed, 231 insertions(+), 47 deletions(-) diff --git a/frappe/automation/workspace/tools/tools.json b/frappe/automation/workspace/tools/tools.json index 4a0835657b..1f81050d78 100644 --- a/frappe/automation/workspace/tools/tools.json +++ b/frappe/automation/workspace/tools/tools.json @@ -1,22 +1,27 @@ { - "category": "Administration", + "category": "", "charts": [], + "content": "[{\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Your Shortcuts\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"ToDo\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Note\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"File\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Assignment Rule\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Auto Repeat\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Tools\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Email\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Automation\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Event Streaming\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}]", "creation": "2020-03-02 14:53:24.980279", "developer_mode_only": 0, "disable_user_customization": 0, "docstatus": 0, "doctype": "Workspace", + "extends": "", "extends_another_page": 0, + "for_user": "", "hide_custom": 0, "icon": "tool", "idx": 0, - "is_standard": 1, + "is_default": 0, + "is_standard": 0, "label": "Tools", "links": [ { "hidden": 0, "is_query_report": 0, "label": "Tools", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -25,6 +30,7 @@ "hidden": 0, "is_query_report": 0, "label": "To Do", + "link_count": 0, "link_to": "ToDo", "link_type": "DocType", "onboard": 1, @@ -35,6 +41,7 @@ "hidden": 0, "is_query_report": 0, "label": "Calendar", + "link_count": 0, "link_to": "Event", "link_type": "DocType", "onboard": 1, @@ -45,6 +52,7 @@ "hidden": 0, "is_query_report": 0, "label": "Note", + "link_count": 0, "link_to": "Note", "link_type": "DocType", "onboard": 1, @@ -55,6 +63,7 @@ "hidden": 0, "is_query_report": 0, "label": "Files", + "link_count": 0, "link_to": "File", "link_type": "DocType", "onboard": 0, @@ -65,6 +74,7 @@ "hidden": 0, "is_query_report": 0, "label": "Activity", + "link_count": 0, "link_to": "activity", "link_type": "Page", "onboard": 0, @@ -74,6 +84,7 @@ "hidden": 0, "is_query_report": 0, "label": "Email", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -82,6 +93,7 @@ "hidden": 0, "is_query_report": 0, "label": "Newsletter", + "link_count": 0, "link_to": "Newsletter", "link_type": "DocType", "onboard": 1, @@ -92,6 +104,7 @@ "hidden": 0, "is_query_report": 0, "label": "Email Group", + "link_count": 0, "link_to": "Email Group", "link_type": "DocType", "onboard": 0, @@ -101,6 +114,7 @@ "hidden": 0, "is_query_report": 0, "label": "Automation", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -109,6 +123,7 @@ "hidden": 0, "is_query_report": 0, "label": "Assignment Rule", + "link_count": 0, "link_to": "Assignment Rule", "link_type": "DocType", "onboard": 0, @@ -119,6 +134,7 @@ "hidden": 0, "is_query_report": 0, "label": "Milestone", + "link_count": 0, "link_to": "Milestone", "link_type": "DocType", "onboard": 0, @@ -129,6 +145,7 @@ "hidden": 0, "is_query_report": 0, "label": "Auto Repeat", + "link_count": 0, "link_to": "Auto Repeat", "link_type": "DocType", "onboard": 0, @@ -138,6 +155,7 @@ "hidden": 0, "is_query_report": 0, "label": "Event Streaming", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -146,6 +164,7 @@ "hidden": 0, "is_query_report": 0, "label": "Event Producer", + "link_count": 0, "link_to": "Event Producer", "link_type": "DocType", "onboard": 0, @@ -156,6 +175,7 @@ "hidden": 0, "is_query_report": 0, "label": "Event Consumer", + "link_count": 0, "link_to": "Event Consumer", "link_type": "DocType", "onboard": 0, @@ -166,6 +186,7 @@ "hidden": 0, "is_query_report": 0, "label": "Event Update Log", + "link_count": 0, "link_to": "Event Update Log", "link_type": "DocType", "onboard": 0, @@ -176,6 +197,7 @@ "hidden": 0, "is_query_report": 0, "label": "Event Sync Log", + "link_count": 0, "link_to": "Event Sync Log", "link_type": "DocType", "onboard": 0, @@ -186,19 +208,24 @@ "hidden": 0, "is_query_report": 0, "label": "Document Type Mapping", + "link_count": 0, "link_to": "Document Type Mapping", "link_type": "DocType", "onboard": 0, "type": "Link" } ], - "modified": "2020-12-01 13:38:39.950350", + "modified": "2021-07-08 15:32:01.445886", "modified_by": "Administrator", "module": "Automation", "name": "Tools", + "onboarding": "", "owner": "Administrator", "pin_to_bottom": 0, "pin_to_top": 0, + "public": 1, + "restrict_to_domain": "", + "sequence_id": 26, "shortcuts": [ { "label": "ToDo", @@ -225,5 +252,6 @@ "link_to": "Auto Repeat", "type": "DocType" } - ] + ], + "title": "Tools" } \ No newline at end of file diff --git a/frappe/core/workspace/build/build.json b/frappe/core/workspace/build/build.json index aefda698b1..ac103452c0 100644 --- a/frappe/core/workspace/build/build.json +++ b/frappe/core/workspace/build/build.json @@ -1,24 +1,28 @@ { "cards_label": "Elements", - "category": "Modules", + "category": "", "charts": [], + "content": "[{\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Your Shortcuts\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"DocType\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Workspace\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Report\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Elements\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Modules\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Models\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Views\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Scripting\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}]", "creation": "2021-01-02 10:51:16.579957", "developer_mode_only": 0, "disable_user_customization": 0, "docstatus": 0, "doctype": "Workspace", + "extends": "", "extends_another_page": 0, + "for_user": "", "hide_custom": 0, "icon": "tool", "idx": 0, "is_default": 0, - "is_standard": 1, + "is_standard": 0, "label": "Build", "links": [ { "hidden": 0, "is_query_report": 0, "label": "Modules", + "link_count": 0, "link_type": "DocType", "onboard": 0, "only_for": "", @@ -28,6 +32,7 @@ "hidden": 0, "is_query_report": 0, "label": "Module Def", + "link_count": 0, "link_to": "Module Def", "link_type": "DocType", "onboard": 0, @@ -38,6 +43,7 @@ "hidden": 0, "is_query_report": 0, "label": "Workspace", + "link_count": 0, "link_to": "Workspace", "link_type": "DocType", "onboard": 0, @@ -48,6 +54,7 @@ "hidden": 0, "is_query_report": 0, "label": "Module Onboarding", + "link_count": 0, "link_to": "Module Onboarding", "link_type": "DocType", "onboard": 0, @@ -58,6 +65,7 @@ "hidden": 0, "is_query_report": 0, "label": "Block Module", + "link_count": 0, "link_to": "Block Module", "link_type": "DocType", "onboard": 0, @@ -68,6 +76,7 @@ "hidden": 0, "is_query_report": 0, "label": "Models", + "link_count": 0, "link_type": "DocType", "onboard": 0, "only_for": "", @@ -77,6 +86,7 @@ "hidden": 0, "is_query_report": 0, "label": "DocType", + "link_count": 0, "link_to": "DocType", "link_type": "DocType", "onboard": 0, @@ -87,6 +97,7 @@ "hidden": 0, "is_query_report": 0, "label": "Workflow", + "link_count": 0, "link_to": "Workflow", "link_type": "DocType", "onboard": 0, @@ -97,6 +108,7 @@ "hidden": 0, "is_query_report": 0, "label": "Views", + "link_count": 0, "link_type": "DocType", "onboard": 0, "only_for": "", @@ -106,6 +118,7 @@ "hidden": 0, "is_query_report": 0, "label": "Report", + "link_count": 0, "link_to": "Report", "link_type": "DocType", "onboard": 0, @@ -116,6 +129,7 @@ "hidden": 0, "is_query_report": 0, "label": "Print Format", + "link_count": 0, "link_to": "Print Format", "link_type": "DocType", "onboard": 0, @@ -126,6 +140,7 @@ "hidden": 0, "is_query_report": 0, "label": "Workspace", + "link_count": 0, "link_to": "Workspace", "link_type": "DocType", "onboard": 0, @@ -136,6 +151,7 @@ "hidden": 0, "is_query_report": 0, "label": "Dashboard", + "link_count": 0, "link_to": "Dashboard", "link_type": "DocType", "onboard": 0, @@ -146,6 +162,7 @@ "hidden": 0, "is_query_report": 0, "label": "Scripting", + "link_count": 0, "link_type": "DocType", "onboard": 0, "only_for": "", @@ -155,6 +172,7 @@ "hidden": 0, "is_query_report": 0, "label": "Server Script", + "link_count": 0, "link_to": "Server Script", "link_type": "DocType", "onboard": 0, @@ -165,6 +183,7 @@ "hidden": 0, "is_query_report": 0, "label": "Client Script", + "link_count": 0, "link_to": "Client Script", "link_type": "DocType", "onboard": 0, @@ -175,6 +194,7 @@ "hidden": 0, "is_query_report": 0, "label": "Scheduled Job Type", + "link_count": 0, "link_to": "Scheduled Job Type", "link_type": "DocType", "onboard": 0, @@ -182,13 +202,17 @@ "type": "Link" } ], - "modified": "2021-02-04 13:48:48.493146", + "modified": "2021-07-08 15:31:32.760553", "modified_by": "Administrator", "module": "Core", "name": "Build", + "onboarding": "", "owner": "Administrator", "pin_to_bottom": 0, "pin_to_top": 0, + "public": 1, + "restrict_to_domain": "", + "sequence_id": 5, "shortcuts": [ { "doc_view": "", @@ -208,5 +232,6 @@ "link_to": "Report", "type": "DocType" } - ] + ], + "title": "Build" } \ No newline at end of file diff --git a/frappe/core/workspace/settings/settings.json b/frappe/core/workspace/settings/settings.json index fb26b73cfc..ab8381b7fd 100644 --- a/frappe/core/workspace/settings/settings.json +++ b/frappe/core/workspace/settings/settings.json @@ -1,22 +1,27 @@ { - "category": "Modules", + "category": "", "charts": [], + "content": "[{\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Settings\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"System Settings\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Print Settings\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Website Settings\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Data\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Email / Notifications\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Website\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Core\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Printing\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Workflow\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}]", "creation": "2020-03-02 15:09:40.527211", "developer_mode_only": 0, - "disable_user_customization": 1, + "disable_user_customization": 0, "docstatus": 0, "doctype": "Workspace", + "extends": "", "extends_another_page": 0, + "for_user": "", "hide_custom": 0, "icon": "setting", "idx": 0, - "is_standard": 1, + "is_default": 0, + "is_standard": 0, "label": "Settings", "links": [ { "hidden": 0, "is_query_report": 0, "label": "Data", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -25,6 +30,7 @@ "hidden": 0, "is_query_report": 0, "label": "Import Data", + "link_count": 0, "link_to": "Data Import", "link_type": "DocType", "onboard": 0, @@ -35,6 +41,7 @@ "hidden": 0, "is_query_report": 0, "label": "Export Data", + "link_count": 0, "link_to": "Data Export", "link_type": "DocType", "onboard": 0, @@ -45,6 +52,7 @@ "hidden": 0, "is_query_report": 0, "label": "Bulk Update", + "link_count": 0, "link_to": "Bulk Update", "link_type": "DocType", "onboard": 0, @@ -55,6 +63,7 @@ "hidden": 0, "is_query_report": 0, "label": "Download Backups", + "link_count": 0, "link_to": "backups", "link_type": "Page", "onboard": 0, @@ -65,6 +74,7 @@ "hidden": 0, "is_query_report": 0, "label": "Deleted Documents", + "link_count": 0, "link_to": "Deleted Document", "link_type": "DocType", "onboard": 0, @@ -74,6 +84,7 @@ "hidden": 0, "is_query_report": 0, "label": "Email / Notifications", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -82,6 +93,7 @@ "hidden": 0, "is_query_report": 0, "label": "Email Account", + "link_count": 0, "link_to": "Email Account", "link_type": "DocType", "onboard": 0, @@ -92,6 +104,7 @@ "hidden": 0, "is_query_report": 0, "label": "Email Domain", + "link_count": 0, "link_to": "Email Domain", "link_type": "DocType", "onboard": 0, @@ -102,6 +115,7 @@ "hidden": 0, "is_query_report": 0, "label": "Notification", + "link_count": 0, "link_to": "Notification", "link_type": "DocType", "onboard": 0, @@ -112,6 +126,7 @@ "hidden": 0, "is_query_report": 0, "label": "Email Template", + "link_count": 0, "link_to": "Email Template", "link_type": "DocType", "onboard": 0, @@ -122,6 +137,7 @@ "hidden": 0, "is_query_report": 0, "label": "Auto Email Report", + "link_count": 0, "link_to": "Auto Email Report", "link_type": "DocType", "onboard": 0, @@ -132,6 +148,7 @@ "hidden": 0, "is_query_report": 0, "label": "Newsletter", + "link_count": 0, "link_to": "Newsletter", "link_type": "DocType", "onboard": 0, @@ -142,6 +159,7 @@ "hidden": 0, "is_query_report": 0, "label": "Notification Settings", + "link_count": 0, "link_to": "Notification Settings", "link_type": "DocType", "onboard": 0, @@ -151,6 +169,7 @@ "hidden": 0, "is_query_report": 0, "label": "Website", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -159,6 +178,7 @@ "hidden": 0, "is_query_report": 0, "label": "Website Settings", + "link_count": 0, "link_to": "Website Settings", "link_type": "DocType", "onboard": 1, @@ -169,6 +189,7 @@ "hidden": 0, "is_query_report": 0, "label": "Website Theme", + "link_count": 0, "link_to": "Website Theme", "link_type": "DocType", "onboard": 1, @@ -179,6 +200,7 @@ "hidden": 0, "is_query_report": 0, "label": "Website Script", + "link_count": 0, "link_to": "Website Script", "link_type": "DocType", "onboard": 0, @@ -189,6 +211,7 @@ "hidden": 0, "is_query_report": 0, "label": "About Us Settings", + "link_count": 0, "link_to": "About Us Settings", "link_type": "DocType", "onboard": 0, @@ -199,6 +222,7 @@ "hidden": 0, "is_query_report": 0, "label": "Contact Us Settings", + "link_count": 0, "link_to": "Contact Us Settings", "link_type": "DocType", "onboard": 0, @@ -208,6 +232,7 @@ "hidden": 0, "is_query_report": 0, "label": "Core", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -216,6 +241,7 @@ "hidden": 0, "is_query_report": 0, "label": "System Settings", + "link_count": 0, "link_to": "System Settings", "link_type": "DocType", "onboard": 0, @@ -226,6 +252,7 @@ "hidden": 0, "is_query_report": 0, "label": "Error Log", + "link_count": 0, "link_to": "Error Log", "link_type": "DocType", "onboard": 0, @@ -236,6 +263,7 @@ "hidden": 0, "is_query_report": 0, "label": "Error Snapshot", + "link_count": 0, "link_to": "Error Snapshot", "link_type": "DocType", "onboard": 0, @@ -246,6 +274,7 @@ "hidden": 0, "is_query_report": 0, "label": "Domain Settings", + "link_count": 0, "link_to": "Domain Settings", "link_type": "DocType", "onboard": 0, @@ -255,6 +284,7 @@ "hidden": 0, "is_query_report": 0, "label": "Printing", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -263,6 +293,7 @@ "hidden": 0, "is_query_report": 0, "label": "Print Format Builder", + "link_count": 0, "link_to": "print-format-builder", "link_type": "Page", "onboard": 0, @@ -273,6 +304,7 @@ "hidden": 0, "is_query_report": 0, "label": "Print Settings", + "link_count": 0, "link_to": "Print Settings", "link_type": "DocType", "onboard": 0, @@ -283,6 +315,7 @@ "hidden": 0, "is_query_report": 0, "label": "Print Format", + "link_count": 0, "link_to": "Print Format", "link_type": "DocType", "onboard": 0, @@ -293,6 +326,7 @@ "hidden": 0, "is_query_report": 0, "label": "Print Style", + "link_count": 0, "link_to": "Print Style", "link_type": "DocType", "onboard": 0, @@ -302,6 +336,7 @@ "hidden": 0, "is_query_report": 0, "label": "Workflow", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -310,6 +345,7 @@ "hidden": 0, "is_query_report": 0, "label": "Workflow", + "link_count": 0, "link_to": "Workflow", "link_type": "DocType", "onboard": 0, @@ -320,6 +356,7 @@ "hidden": 0, "is_query_report": 0, "label": "Workflow State", + "link_count": 0, "link_to": "Workflow State", "link_type": "DocType", "onboard": 0, @@ -330,19 +367,24 @@ "hidden": 0, "is_query_report": 0, "label": "Workflow Action", + "link_count": 0, "link_to": "Workflow Action", "link_type": "DocType", "onboard": 0, "type": "Link" } ], - "modified": "2020-12-01 13:38:40.235323", + "modified": "2021-07-08 15:32:04.133559", "modified_by": "Administrator", "module": "Core", "name": "Settings", + "onboarding": "", "owner": "Administrator", - "pin_to_bottom": 1, + "pin_to_bottom": 0, "pin_to_top": 0, + "public": 1, + "restrict_to_domain": "", + "sequence_id": 29, "shortcuts": [ { "icon": "setting", @@ -363,5 +405,6 @@ "type": "DocType" } ], - "shortcuts_label": "Settings" + "shortcuts_label": "Settings", + "title": "Settings" } \ No newline at end of file diff --git a/frappe/core/workspace/users/users.json b/frappe/core/workspace/users/users.json index ba82461b57..f9713222f5 100644 --- a/frappe/core/workspace/users/users.json +++ b/frappe/core/workspace/users/users.json @@ -1,23 +1,27 @@ { - "category": "Administration", + "category": "", "charts": [], + "content": "[{\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Your Shortcuts\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"User\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Role\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Permission Manager\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"User Profile\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"User Type\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Users\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Logs\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Permissions\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}]", "creation": "2020-03-02 15:12:16.754449", "developer_mode_only": 0, "disable_user_customization": 0, "docstatus": 0, "doctype": "Workspace", + "extends": "", "extends_another_page": 0, + "for_user": "", "hide_custom": 0, "icon": "users", "idx": 0, "is_default": 0, - "is_standard": 1, + "is_standard": 0, "label": "Users", "links": [ { "hidden": 0, "is_query_report": 0, "label": "Users", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -26,6 +30,7 @@ "hidden": 0, "is_query_report": 0, "label": "User", + "link_count": 0, "link_to": "User", "link_type": "DocType", "onboard": 0, @@ -36,6 +41,7 @@ "hidden": 0, "is_query_report": 0, "label": "Role", + "link_count": 0, "link_to": "Role", "link_type": "DocType", "onboard": 0, @@ -46,6 +52,7 @@ "hidden": 0, "is_query_report": 0, "label": "Role Profile", + "link_count": 0, "link_to": "Role Profile", "link_type": "DocType", "onboard": 0, @@ -55,6 +62,7 @@ "hidden": 0, "is_query_report": 0, "label": "Logs", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -63,6 +71,7 @@ "hidden": 0, "is_query_report": 0, "label": "Activity Log", + "link_count": 0, "link_to": "Activity Log", "link_type": "DocType", "onboard": 0, @@ -73,6 +82,7 @@ "hidden": 0, "is_query_report": 0, "label": "Access Log", + "link_count": 0, "link_to": "Access Log", "link_type": "DocType", "onboard": 0, @@ -82,6 +92,7 @@ "hidden": 0, "is_query_report": 0, "label": "Permissions", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -90,6 +101,7 @@ "hidden": 0, "is_query_report": 0, "label": "Role Permissions Manager", + "link_count": 0, "link_to": "permission-manager", "link_type": "Page", "onboard": 0, @@ -100,6 +112,7 @@ "hidden": 0, "is_query_report": 0, "label": "User Permissions", + "link_count": 0, "link_to": "User Permission", "link_type": "DocType", "onboard": 0, @@ -110,6 +123,7 @@ "hidden": 0, "is_query_report": 0, "label": "Role Permission for Page and Report", + "link_count": 0, "link_to": "Role Permission for Page and Report", "link_type": "DocType", "onboard": 0, @@ -120,6 +134,7 @@ "hidden": 0, "is_query_report": 1, "label": "Permitted Documents For User", + "link_count": 0, "link_to": "Permitted Documents For User", "link_type": "Report", "onboard": 0, @@ -130,19 +145,24 @@ "hidden": 0, "is_query_report": 0, "label": "Document Share Report", + "link_count": 0, "link_to": "Document Share Report", "link_type": "Report", "onboard": 0, "type": "Link" } ], - "modified": "2021-03-25 23:02:34.582569", + "modified": "2021-07-08 15:32:02.279021", "modified_by": "Administrator", "module": "Core", "name": "Users", + "onboarding": "", "owner": "Administrator", "pin_to_bottom": 0, "pin_to_top": 0, + "public": 1, + "restrict_to_domain": "", + "sequence_id": 27, "shortcuts": [ { "label": "User", @@ -170,5 +190,6 @@ "link_to": "User Type", "type": "DocType" } - ] + ], + "title": "Users" } \ No newline at end of file diff --git a/frappe/custom/workspace/customization/customization.json b/frappe/custom/workspace/customization/customization.json index cdc3b73366..5e0c96e648 100644 --- a/frappe/custom/workspace/customization/customization.json +++ b/frappe/custom/workspace/customization/customization.json @@ -1,23 +1,27 @@ { - "category": "Administration", + "category": "", "charts": [], + "content": "[{\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Your Shortcuts\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Customize Form\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Custom Role\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Client Script\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Server Script\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Dashboards\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Form Customization\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Other\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}]", "creation": "2020-03-02 15:15:03.839594", "developer_mode_only": 0, "disable_user_customization": 0, "docstatus": 0, "doctype": "Workspace", + "extends": "", "extends_another_page": 0, + "for_user": "", "hide_custom": 0, "icon": "customization", "idx": 0, "is_default": 0, - "is_standard": 1, + "is_standard": 0, "label": "Customization", "links": [ { "hidden": 0, "is_query_report": 0, "label": "Dashboards", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -26,6 +30,7 @@ "hidden": 0, "is_query_report": 0, "label": "Dashboard", + "link_count": 0, "link_to": "Dashboard", "link_type": "DocType", "onboard": 0, @@ -36,6 +41,7 @@ "hidden": 0, "is_query_report": 0, "label": "Dashboard Chart", + "link_count": 0, "link_to": "Dashboard Chart", "link_type": "DocType", "onboard": 0, @@ -46,6 +52,7 @@ "hidden": 0, "is_query_report": 0, "label": "Dashboard Chart Source", + "link_count": 0, "link_to": "Dashboard Chart Source", "link_type": "DocType", "onboard": 0, @@ -55,6 +62,7 @@ "hidden": 0, "is_query_report": 0, "label": "Form Customization", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -63,6 +71,7 @@ "hidden": 0, "is_query_report": 0, "label": "Customize Form", + "link_count": 0, "link_to": "Customize Form", "link_type": "DocType", "onboard": 0, @@ -73,6 +82,7 @@ "hidden": 0, "is_query_report": 0, "label": "Custom Field", + "link_count": 0, "link_to": "Custom Field", "link_type": "DocType", "onboard": 0, @@ -83,6 +93,7 @@ "hidden": 0, "is_query_report": 0, "label": "Client Script", + "link_count": 0, "link_to": "Client Script", "link_type": "DocType", "onboard": 0, @@ -93,6 +104,7 @@ "hidden": 0, "is_query_report": 0, "label": "DocType", + "link_count": 0, "link_to": "DocType", "link_type": "DocType", "onboard": 0, @@ -102,6 +114,7 @@ "hidden": 0, "is_query_report": 0, "label": "Other", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -110,19 +123,24 @@ "hidden": 0, "is_query_report": 0, "label": "Custom Translations", + "link_count": 0, "link_to": "Translation", "link_type": "DocType", "onboard": 0, "type": "Link" } ], - "modified": "2021-02-04 13:50:35.750463", + "modified": "2021-07-08 15:31:37.060381", "modified_by": "Administrator", "module": "Custom", "name": "Customization", + "onboarding": "", "owner": "Administrator", "pin_to_bottom": 0, "pin_to_top": 0, + "public": 1, + "restrict_to_domain": "", + "sequence_id": 8, "shortcuts": [ { "label": "Customize Form", @@ -145,5 +163,6 @@ "link_to": "Server Script", "type": "DocType" } - ] + ], + "title": "Customization" } \ No newline at end of file diff --git a/frappe/integrations/workspace/integrations/integrations.json b/frappe/integrations/workspace/integrations/integrations.json index db96304207..9650bb2ed6 100644 --- a/frappe/integrations/workspace/integrations/integrations.json +++ b/frappe/integrations/workspace/integrations/integrations.json @@ -1,22 +1,27 @@ { - "category": "Administration", + "category": "", "charts": [], + "content": "[{\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Backup\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Google Services\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Authentication\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Payments\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Settings\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}]", "creation": "2020-03-02 15:16:18.714190", "developer_mode_only": 0, - "disable_user_customization": 1, + "disable_user_customization": 0, "docstatus": 0, "doctype": "Workspace", + "extends": "", "extends_another_page": 0, + "for_user": "", "hide_custom": 0, "icon": "integration", "idx": 0, - "is_standard": 1, + "is_default": 0, + "is_standard": 0, "label": "Integrations", "links": [ { "hidden": 0, "is_query_report": 0, "label": "Backup", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -25,6 +30,7 @@ "hidden": 0, "is_query_report": 0, "label": "Dropbox Settings", + "link_count": 0, "link_to": "Dropbox Settings", "link_type": "DocType", "onboard": 0, @@ -35,6 +41,7 @@ "hidden": 0, "is_query_report": 0, "label": "S3 Backup Settings", + "link_count": 0, "link_to": "S3 Backup Settings", "link_type": "DocType", "onboard": 0, @@ -45,6 +52,7 @@ "hidden": 0, "is_query_report": 0, "label": "Google Drive", + "link_count": 0, "link_to": "Google Drive", "link_type": "DocType", "onboard": 0, @@ -54,6 +62,7 @@ "hidden": 0, "is_query_report": 0, "label": "Google Services", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -62,6 +71,7 @@ "hidden": 0, "is_query_report": 0, "label": "Google Settings", + "link_count": 0, "link_to": "Google Settings", "link_type": "DocType", "onboard": 0, @@ -72,6 +82,7 @@ "hidden": 0, "is_query_report": 0, "label": "Google Contacts", + "link_count": 0, "link_to": "Google Contacts", "link_type": "DocType", "onboard": 0, @@ -82,6 +93,7 @@ "hidden": 0, "is_query_report": 0, "label": "Google Calendar", + "link_count": 0, "link_to": "Google Calendar", "link_type": "DocType", "onboard": 0, @@ -92,6 +104,7 @@ "hidden": 0, "is_query_report": 0, "label": "Google Drive", + "link_count": 0, "link_to": "Google Drive", "link_type": "DocType", "onboard": 0, @@ -101,6 +114,7 @@ "hidden": 0, "is_query_report": 0, "label": "Authentication", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -109,6 +123,7 @@ "hidden": 0, "is_query_report": 0, "label": "Social Login Key", + "link_count": 0, "link_to": "Social Login Key", "link_type": "DocType", "onboard": 0, @@ -119,6 +134,7 @@ "hidden": 0, "is_query_report": 0, "label": "LDAP Settings", + "link_count": 0, "link_to": "LDAP Settings", "link_type": "DocType", "onboard": 0, @@ -129,6 +145,7 @@ "hidden": 0, "is_query_report": 0, "label": "OAuth Client", + "link_count": 0, "link_to": "OAuth Client", "link_type": "DocType", "onboard": 0, @@ -139,6 +156,7 @@ "hidden": 0, "is_query_report": 0, "label": "OAuth Provider Settings", + "link_count": 0, "link_to": "OAuth Provider Settings", "link_type": "DocType", "onboard": 0, @@ -148,6 +166,7 @@ "hidden": 0, "is_query_report": 0, "label": "Payments", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -156,6 +175,7 @@ "hidden": 0, "is_query_report": 0, "label": "Braintree Settings", + "link_count": 0, "link_to": "Braintree Settings", "link_type": "DocType", "onboard": 0, @@ -166,6 +186,7 @@ "hidden": 0, "is_query_report": 0, "label": "PayPal Settings", + "link_count": 0, "link_to": "PayPal Settings", "link_type": "DocType", "onboard": 0, @@ -176,6 +197,7 @@ "hidden": 0, "is_query_report": 0, "label": "Razorpay Settings", + "link_count": 0, "link_to": "Razorpay Settings", "link_type": "DocType", "onboard": 0, @@ -186,6 +208,7 @@ "hidden": 0, "is_query_report": 0, "label": "Stripe Settings", + "link_count": 0, "link_to": "Stripe Settings", "link_type": "DocType", "onboard": 0, @@ -196,6 +219,7 @@ "hidden": 0, "is_query_report": 0, "label": "Paytm Settings", + "link_count": 0, "link_to": "Paytm Settings", "link_type": "DocType", "onboard": 0, @@ -205,6 +229,7 @@ "hidden": 0, "is_query_report": 0, "label": "Settings", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -213,6 +238,7 @@ "hidden": 0, "is_query_report": 0, "label": "Webhook", + "link_count": 0, "link_to": "Webhook", "link_type": "DocType", "onboard": 0, @@ -223,38 +249,35 @@ "hidden": 0, "is_query_report": 0, "label": "Slack Webhook URL", + "link_count": 0, "link_to": "Slack Webhook URL", "link_type": "DocType", "onboard": 0, "type": "Link" }, - { - "dependencies": "", - "hidden": 0, - "is_query_report": 0, - "label": "Twilio Settings", - "link_to": "Twilio Settings", - "link_type": "DocType", - "onboard": 0, - "type": "Link" - }, { "dependencies": "", "hidden": 0, "is_query_report": 0, "label": "SMS Settings", + "link_count": 0, "link_to": "SMS Settings", "link_type": "DocType", "onboard": 0, "type": "Link" } ], - "modified": "2020-12-01 13:38:39.706680", + "modified": "2021-07-08 15:31:47.399175", "modified_by": "Administrator", "module": "Integrations", "name": "Integrations", + "onboarding": "", "owner": "Administrator", "pin_to_bottom": 0, "pin_to_top": 0, - "shortcuts": [] + "public": 1, + "restrict_to_domain": "", + "sequence_id": 15, + "shortcuts": [], + "title": "Integrations" } \ No newline at end of file diff --git a/frappe/website/workspace/website/website.json b/frappe/website/workspace/website/website.json index a2a4a299c4..afb73125cd 100644 --- a/frappe/website/workspace/website/website.json +++ b/frappe/website/workspace/website/website.json @@ -1,20 +1,20 @@ { - "category": "Modules", - "charts": [ - { - "chart_name": "Website Analytics" - } - ], + "category": "", + "charts": [], + "content": "[{\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Your Shortcuts\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Blog Post\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Blogger\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Web Page\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Web Form\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Website Settings\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Setup\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Blog\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Web Site\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Portal\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Knowledge Base\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}]", "creation": "2020-03-02 14:13:51.089373", "developer_mode_only": 0, "disable_user_customization": 0, "docstatus": 0, "doctype": "Workspace", + "extends": "", "extends_another_page": 0, + "for_user": "", "hide_custom": 0, "icon": "website", "idx": 0, - "is_standard": 1, + "is_default": 0, + "is_standard": 0, "label": "Website", "links": [ { @@ -22,6 +22,7 @@ "icon": "setting", "is_query_report": 0, "label": "Setup", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -30,6 +31,7 @@ "hidden": 0, "is_query_report": 0, "label": "Website Settings", + "link_count": 0, "link_to": "Website Settings", "link_type": "DocType", "onboard": 1, @@ -40,6 +42,7 @@ "hidden": 0, "is_query_report": 0, "label": "Website Theme", + "link_count": 0, "link_to": "Website Theme", "link_type": "DocType", "onboard": 1, @@ -50,6 +53,7 @@ "hidden": 0, "is_query_report": 0, "label": "Website Script", + "link_count": 0, "link_to": "Website Script", "link_type": "DocType", "onboard": 0, @@ -60,6 +64,7 @@ "hidden": 0, "is_query_report": 0, "label": "About Us Settings", + "link_count": 0, "link_to": "About Us Settings", "link_type": "DocType", "onboard": 0, @@ -70,6 +75,7 @@ "hidden": 0, "is_query_report": 0, "label": "Contact Us Settings", + "link_count": 0, "link_to": "Contact Us Settings", "link_type": "DocType", "onboard": 0, @@ -80,6 +86,7 @@ "icon": "", "is_query_report": 0, "label": "Blog", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -88,6 +95,7 @@ "hidden": 0, "is_query_report": 0, "label": "Blog Post", + "link_count": 0, "link_to": "Blog Post", "link_type": "DocType", "onboard": 1, @@ -98,6 +106,7 @@ "hidden": 0, "is_query_report": 0, "label": "Blogger", + "link_count": 0, "link_to": "Blogger", "link_type": "DocType", "onboard": 0, @@ -108,6 +117,7 @@ "hidden": 0, "is_query_report": 0, "label": "Blog Category", + "link_count": 0, "link_to": "Blog Category", "link_type": "DocType", "onboard": 0, @@ -118,6 +128,7 @@ "icon": "website", "is_query_report": 0, "label": "Web Site", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -126,6 +137,7 @@ "hidden": 0, "is_query_report": 0, "label": "Web Page", + "link_count": 0, "link_to": "Web Page", "link_type": "DocType", "onboard": 1, @@ -136,6 +148,7 @@ "hidden": 0, "is_query_report": 0, "label": "Web Form", + "link_count": 0, "link_to": "Web Form", "link_type": "DocType", "onboard": 1, @@ -146,6 +159,7 @@ "hidden": 0, "is_query_report": 0, "label": "Website Sidebar", + "link_count": 0, "link_to": "Website Sidebar", "link_type": "DocType", "onboard": 0, @@ -156,6 +170,7 @@ "hidden": 0, "is_query_report": 0, "label": "Website Slideshow", + "link_count": 0, "link_to": "Website Slideshow", "link_type": "DocType", "onboard": 0, @@ -166,6 +181,7 @@ "hidden": 0, "is_query_report": 0, "label": "Website Route Meta", + "link_count": 0, "link_to": "Website Route Meta", "link_type": "DocType", "onboard": 0, @@ -176,6 +192,7 @@ "icon": "website", "is_query_report": 0, "label": "Portal", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -184,6 +201,7 @@ "hidden": 0, "is_query_report": 0, "label": "Portal Settings", + "link_count": 0, "link_to": "Portal Settings", "link_type": "DocType", "onboard": 1, @@ -194,6 +212,7 @@ "icon": "project", "is_query_report": 0, "label": "Knowledge Base", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -202,6 +221,7 @@ "hidden": 0, "is_query_report": 0, "label": "Help Category", + "link_count": 0, "link_to": "Help Category", "link_type": "DocType", "onboard": 0, @@ -212,20 +232,24 @@ "hidden": 0, "is_query_report": 0, "label": "Help Article", + "link_count": 0, "link_to": "Help Article", "link_type": "DocType", "onboard": 0, "type": "Link" } ], - "modified": "2020-12-01 13:38:39.556588", + "modified": "2021-07-08 15:32:03.078096", "modified_by": "Administrator", "module": "Website", "name": "Website", - "onboarding": "Website", + "onboarding": "", "owner": "Administrator", "pin_to_bottom": 0, "pin_to_top": 0, + "public": 1, + "restrict_to_domain": "", + "sequence_id": 28, "shortcuts": [ { "color": "Green", @@ -261,5 +285,6 @@ "link_to": "Website Settings", "type": "DocType" } - ] + ], + "title": "Website" } \ No newline at end of file From 169e14f97fea9534ed799c4529dc0db597d73b1f Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 8 Jul 2021 16:00:28 +0530 Subject: [PATCH 060/306] fix: updated patch --- frappe/desk/doctype/workspace/workspace.py | 6 ++-- frappe/patches/v13_0/update_workspace2.py | 36 ++++++++++++---------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/frappe/desk/doctype/workspace/workspace.py b/frappe/desk/doctype/workspace/workspace.py index 4eede2211e..29a8100bd9 100644 --- a/frappe/desk/doctype/workspace/workspace.py +++ b/frappe/desk/doctype/workspace/workspace.py @@ -26,10 +26,10 @@ class Workspace(Document): frappe.throw(_("You can only have one default page that extends a particular standard page.")) def on_update(self): - if disable_saving_as_standard(): - return + # if disable_saving_as_standard(): + # return - if frappe.conf.developer_mode and self.is_standard: + if frappe.conf.developer_mode and self.module and self.public: export_to_files(record_list=[['Workspace', self.name]], record_module=self.module) @staticmethod diff --git a/frappe/patches/v13_0/update_workspace2.py b/frappe/patches/v13_0/update_workspace2.py index 4fecfb2769..3561a8ff3e 100644 --- a/frappe/patches/v13_0/update_workspace2.py +++ b/frappe/patches/v13_0/update_workspace2.py @@ -4,7 +4,7 @@ from frappe import _ def execute(): frappe.reload_doc('desk', 'doctype', 'workspace', force=True) - order_by = "is_standard asc, pin_to_top desc, pin_to_bottom asc, name asc" + order_by = "pin_to_top desc, pin_to_bottom asc, name asc" for seq, wspace in enumerate(frappe.get_all('Workspace', order_by=order_by)): doc = frappe.get_doc('Workspace', wspace.name) content = create_content(doc) @@ -47,19 +47,21 @@ def create_content(doc): return content def update_wspace(doc, seq, content): - new_doc = frappe.new_doc('Workspace') - new_doc.label = doc.label - new_doc.icon = doc.icon - new_doc.sequence_id = seq + 1 - new_doc.content = json.dumps(content) - new_doc.charts = doc.charts or [] - new_doc.shortcuts = doc.shortcuts or [] - new_doc.links = doc.links or [] - if doc.is_standard: - new_doc.public = 1 - new_doc.title = doc.label - else: - new_doc.for_user = doc.for_user - new_doc.title = doc.extends - frappe.delete_doc("Workspace", doc.name, force=1) - new_doc.insert(ignore_permissions=True) \ No newline at end of file + if not doc.is_standard and not doc.public: + doc.sequence_id = seq + 1 + doc.content = json.dumps(content) + doc.public = 0 + doc.title = doc.extends + doc.extends = '' + doc.category = '' + doc.restrict_to_domain = '' + doc.onboarding = '' + doc.extends_another_page = 0 + doc.is_default = 0 + doc.is_standard = 0 + doc.developer_mode_only = 0 + doc.disable_user_customization = 0 + doc.pin_to_top = 0 + doc.pin_to_bottom = 0 + doc.hide_custom = 0 + doc.save(ignore_permissions=True) \ No newline at end of file From 098005b3051d3958a7ab288fe08de623cdb7055e Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 8 Jul 2021 16:52:51 +0530 Subject: [PATCH 061/306] fix: minor fix --- frappe/desk/desktop.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index 8de6c1301d..ac0db1b2d3 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -390,14 +390,14 @@ def get_desk_sidebar_items(): # pages sorted based on pinned to top and then by name order_by = "pin_to_top desc, pin_to_bottom asc, name asc" - all_pages = frappe.get_all("Workspace", fields=["name", "category", "icon", "module"], + all_pages = frappe.get_all("Workspace", fields=["name", "title", "public", "module", "icon"], filters=filters, order_by=order_by, ignore_permissions=True) pages = [] # Filter Page based on Permission for page in all_pages: try: - wspace = Workspace(page.get('name')) + wspace = Workspace(page) if wspace.is_page_allowed(): pages.append(page) page['label'] = _(page.get('name')) From 8475c6c4261e74bbe591761e369eef7e0e4ca020 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 8 Jul 2021 17:41:22 +0530 Subject: [PATCH 062/306] fix: updated wspace json files --- frappe/automation/workspace/tools/tools.json | 3 ++- frappe/core/workspace/build/build.json | 3 ++- frappe/core/workspace/settings/settings.json | 3 ++- frappe/core/workspace/users/users.json | 3 ++- frappe/custom/workspace/customization/customization.json | 3 ++- frappe/integrations/workspace/integrations/integrations.json | 3 ++- frappe/website/workspace/website/website.json | 3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/frappe/automation/workspace/tools/tools.json b/frappe/automation/workspace/tools/tools.json index 1f81050d78..eb399f6e0b 100644 --- a/frappe/automation/workspace/tools/tools.json +++ b/frappe/automation/workspace/tools/tools.json @@ -215,12 +215,13 @@ "type": "Link" } ], - "modified": "2021-07-08 15:32:01.445886", + "modified": "2021-07-08 17:36:29.878969", "modified_by": "Administrator", "module": "Automation", "name": "Tools", "onboarding": "", "owner": "Administrator", + "parent_page": "", "pin_to_bottom": 0, "pin_to_top": 0, "public": 1, diff --git a/frappe/core/workspace/build/build.json b/frappe/core/workspace/build/build.json index ac103452c0..a911a928f5 100644 --- a/frappe/core/workspace/build/build.json +++ b/frappe/core/workspace/build/build.json @@ -202,12 +202,13 @@ "type": "Link" } ], - "modified": "2021-07-08 15:31:32.760553", + "modified": "2021-07-08 17:36:06.916752", "modified_by": "Administrator", "module": "Core", "name": "Build", "onboarding": "", "owner": "Administrator", + "parent_page": "", "pin_to_bottom": 0, "pin_to_top": 0, "public": 1, diff --git a/frappe/core/workspace/settings/settings.json b/frappe/core/workspace/settings/settings.json index ab8381b7fd..2f6ab32070 100644 --- a/frappe/core/workspace/settings/settings.json +++ b/frappe/core/workspace/settings/settings.json @@ -374,12 +374,13 @@ "type": "Link" } ], - "modified": "2021-07-08 15:32:04.133559", + "modified": "2021-07-08 17:36:32.236600", "modified_by": "Administrator", "module": "Core", "name": "Settings", "onboarding": "", "owner": "Administrator", + "parent_page": "", "pin_to_bottom": 0, "pin_to_top": 0, "public": 1, diff --git a/frappe/core/workspace/users/users.json b/frappe/core/workspace/users/users.json index f9713222f5..f1994b54d9 100644 --- a/frappe/core/workspace/users/users.json +++ b/frappe/core/workspace/users/users.json @@ -152,12 +152,13 @@ "type": "Link" } ], - "modified": "2021-07-08 15:32:02.279021", + "modified": "2021-07-08 17:36:30.639286", "modified_by": "Administrator", "module": "Core", "name": "Users", "onboarding": "", "owner": "Administrator", + "parent_page": "", "pin_to_bottom": 0, "pin_to_top": 0, "public": 1, diff --git a/frappe/custom/workspace/customization/customization.json b/frappe/custom/workspace/customization/customization.json index 5e0c96e648..6b1c0f1c78 100644 --- a/frappe/custom/workspace/customization/customization.json +++ b/frappe/custom/workspace/customization/customization.json @@ -130,12 +130,13 @@ "type": "Link" } ], - "modified": "2021-07-08 15:31:37.060381", + "modified": "2021-07-08 17:36:10.615028", "modified_by": "Administrator", "module": "Custom", "name": "Customization", "onboarding": "", "owner": "Administrator", + "parent_page": "", "pin_to_bottom": 0, "pin_to_top": 0, "public": 1, diff --git a/frappe/integrations/workspace/integrations/integrations.json b/frappe/integrations/workspace/integrations/integrations.json index 9650bb2ed6..3c579052ca 100644 --- a/frappe/integrations/workspace/integrations/integrations.json +++ b/frappe/integrations/workspace/integrations/integrations.json @@ -267,12 +267,13 @@ "type": "Link" } ], - "modified": "2021-07-08 15:31:47.399175", + "modified": "2021-07-08 17:36:18.712550", "modified_by": "Administrator", "module": "Integrations", "name": "Integrations", "onboarding": "", "owner": "Administrator", + "parent_page": "", "pin_to_bottom": 0, "pin_to_top": 0, "public": 1, diff --git a/frappe/website/workspace/website/website.json b/frappe/website/workspace/website/website.json index afb73125cd..09af279410 100644 --- a/frappe/website/workspace/website/website.json +++ b/frappe/website/workspace/website/website.json @@ -239,12 +239,13 @@ "type": "Link" } ], - "modified": "2021-07-08 15:32:03.078096", + "modified": "2021-07-08 17:36:31.292527", "modified_by": "Administrator", "module": "Website", "name": "Website", "onboarding": "", "owner": "Administrator", + "parent_page": "", "pin_to_bottom": 0, "pin_to_top": 0, "public": 1, From e8e7211d62ff8b5fe9c0fea435505cba83e5d6f2 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 8 Jul 2021 20:56:58 +0530 Subject: [PATCH 063/306] fix: Auto scroll sidebar to selected page --- frappe/desk/doctype/workspace/workspace.py | 6 +++--- frappe/public/js/frappe/views/workspace/workspace.js | 8 +++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/frappe/desk/doctype/workspace/workspace.py b/frappe/desk/doctype/workspace/workspace.py index 29a8100bd9..93a7b13d17 100644 --- a/frappe/desk/doctype/workspace/workspace.py +++ b/frappe/desk/doctype/workspace/workspace.py @@ -206,12 +206,12 @@ def save_page(title, parent, public, sb_items, deleted_pages, new_widgets, block doc.content = blocks doc.save(ignore_permissions=True) - if json.loads(sb_items): - sort_pages(json.loads(sb_items)) - if json.loads(new_widgets): save_new_widget(doc, title, blocks, new_widgets) + if json.loads(sb_items): + sort_pages(json.loads(sb_items)) + if json.loads(deleted_pages): return delete_pages(json.loads(deleted_pages)) diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index 2bc21060bd..c65c8aa232 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -145,6 +145,8 @@ frappe.views.Workspace = class Workspace { } this.build_sidebar_section(category, root_pages); }); + + this.sidebar.find('.selected')[0].scrollIntoView(); } build_sidebar_section(title, root_pages) { @@ -152,7 +154,7 @@ frappe.views.Workspace = class Workspace { let $title = $(`
${frappe.utils.icon("small-down", "xs")} - ${__(title)} + ${__(title)}
`).appendTo(sidebar_section); this.prepare_sidebar(root_pages, sidebar_section, this.sidebar); @@ -162,6 +164,10 @@ frappe.views.Workspace = class Workspace { $(e.target).parent().find('.sidebar-item-container').toggleClass('hidden'); }); + if (!this.current_page.name) { + $title.trigger("click"); + } + if (Object.keys(root_pages).length === 0) { sidebar_section.addClass('hidden'); } From 75cb917a7beee86d1d22a100f083a77b6f7ba925 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 13 Jul 2021 21:31:03 +0530 Subject: [PATCH 064/306] test: UI test for datetime field form validation --- .../datetime_field_form_validation.js | 18 ++++++++++++++++++ frappe/tests/ui_test_helpers.py | 12 ++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 cypress/integration/datetime_field_form_validation.js diff --git a/cypress/integration/datetime_field_form_validation.js b/cypress/integration/datetime_field_form_validation.js new file mode 100644 index 0000000000..6a6ea4c7af --- /dev/null +++ b/cypress/integration/datetime_field_form_validation.js @@ -0,0 +1,18 @@ +context('Datetime Validation', () => { + before(() => { + cy.login(); + cy.visit('/app/communication'); + cy.window().its('frappe').then(frappe => { + frappe.call("frappe.tests.ui_test_helpers.create_communication_records"); + }); + }); + + it('datetime field form validation', () => { + cy.visit('/app/communication'); + cy.get('a[title="Test Form Communication 1"]').invoke('attr', 'data-name') + .then((name) => { + cy.visit(`/app/communication/${name}`); + cy.get('.indicator-pill').should('contain', 'Open').should('have.class', 'red'); + }) + }); +}); \ No newline at end of file diff --git a/frappe/tests/ui_test_helpers.py b/frappe/tests/ui_test_helpers.py index f56311b2e3..f4a6f474ce 100644 --- a/frappe/tests/ui_test_helpers.py +++ b/frappe/tests/ui_test_helpers.py @@ -60,6 +60,18 @@ def create_todo_records(): "description": "this is fourth todo" }).insert() +@frappe.whitelist() +def create_communication_records(): + if frappe.db.get_all('Communication', {'subject': 'Test Form Communication 1'}): + return + + frappe.get_doc({ + "doctype": "Communication", + "recipients": "test@gmail.com", + "subject": "Test Form Communication 1", + "communication_date": frappe.utils.now_datetime(), + }).insert() + @frappe.whitelist() def setup_workflow(): from frappe.workflow.doctype.workflow.test_workflow import create_todo_workflow From 98f33b59811f2cdcf9b66f1736e5bedfb77735cc Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 13 Jul 2021 21:56:57 +0530 Subject: [PATCH 065/306] fix: sider fix --- cypress/integration/datetime_field_form_validation.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cypress/integration/datetime_field_form_validation.js b/cypress/integration/datetime_field_form_validation.js index 6a6ea4c7af..dff1f0562c 100644 --- a/cypress/integration/datetime_field_form_validation.js +++ b/cypress/integration/datetime_field_form_validation.js @@ -10,9 +10,9 @@ context('Datetime Validation', () => { it('datetime field form validation', () => { cy.visit('/app/communication'); cy.get('a[title="Test Form Communication 1"]').invoke('attr', 'data-name') - .then((name) => { - cy.visit(`/app/communication/${name}`); - cy.get('.indicator-pill').should('contain', 'Open').should('have.class', 'red'); - }) + .then((name) => { + cy.visit(`/app/communication/${name}`); + cy.get('.indicator-pill').should('contain', 'Open').should('have.class', 'red'); + }); }); }); \ No newline at end of file From e3a1f6f1d09c4973a20c6a562697cb850cb3bc03 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 14 Jul 2021 13:25:17 +0530 Subject: [PATCH 066/306] chore: Added comment --- cypress/integration/datetime_field_form_validation.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cypress/integration/datetime_field_form_validation.js b/cypress/integration/datetime_field_form_validation.js index dff1f0562c..66fdde6863 100644 --- a/cypress/integration/datetime_field_form_validation.js +++ b/cypress/integration/datetime_field_form_validation.js @@ -1,4 +1,4 @@ -context('Datetime Validation', () => { +context('Datetime Field Validation', () => { before(() => { cy.login(); cy.visit('/app/communication'); @@ -7,6 +7,7 @@ context('Datetime Validation', () => { }); }); + // validating datetime field value when value is set from backend and get validated on form load. it('datetime field form validation', () => { cy.visit('/app/communication'); cy.get('a[title="Test Form Communication 1"]').invoke('attr', 'data-name') From 151678d71973d16916574f7e39d1fbb0fc815d79 Mon Sep 17 00:00:00 2001 From: GangaManoj Date: Sat, 17 Jul 2021 05:38:08 +0530 Subject: [PATCH 067/306] fix: Add test for checking workspaces with cards specific to a country --- .../desk/doctype/workspace/test_workspace.py | 92 ++++++++++++++++++- 1 file changed, 89 insertions(+), 3 deletions(-) diff --git a/frappe/desk/doctype/workspace/test_workspace.py b/frappe/desk/doctype/workspace/test_workspace.py index 619b3608eb..8aa3d57adf 100644 --- a/frappe/desk/doctype/workspace/test_workspace.py +++ b/frappe/desk/doctype/workspace/test_workspace.py @@ -1,8 +1,94 @@ # -*- coding: utf-8 -*- # Copyright (c) 2020, Frappe Technologies and Contributors # See license.txt -# import frappe +import frappe import unittest - class TestWorkspace(unittest.TestCase): - pass + def setUp(self): + create_module("Test Module") + + def tearDown(self): + frappe.db.delete("Workspace", {"module": "Test Module"}) + frappe.db.delete("DocType", {"module": "Test Module"}) + frappe.delete_doc("Module Def", "Test Module") + + def test_workspace_with_cards_specific_to_a_country(self): + workspace = create_workspace() + insert_card(workspace, "Card Label 1", "DocType 1", "DocType 2", "France") + insert_card(workspace, "Card Label 2", "DocType A", "DocType B") + + workspace.insert(ignore_if_duplicate = True) + + cards = workspace.get_link_groups() + + if frappe.get_system_settings('country') == "France": + self.assertEqual(len(cards), 2) + else: + self.assertEqual(len(cards), 1) + +def create_module(module_name): + module = frappe.get_doc({ + "doctype": "Module Def", + "module_name": module_name, + "app_name": "frappe" + }) + module.insert(ignore_if_duplicate = True) + + return module + +def create_workspace(**args): + workspace = frappe.new_doc("Workspace") + args = frappe._dict(args) + + workspace.name = args.name or "Test Workspace" + workspace.label = args.label or "Test Workspace" + workspace.category = args.category or "Modules" + workspace.is_standard = args.is_standard or 1 + workspace.module = "Test Module" + + return workspace + +def insert_card(workspace, card_label, doctype1, doctype2, country=None): + workspace.append("links", { + "type": "Card Break", + "label": card_label, + "only_for": country + }) + + create_doctype(doctype1, "Test Module") + workspace.append("links", { + "type": "Link", + "label": doctype1, + "only_for": country, + "link_type": "DocType", + "link_to": doctype1 + }) + + create_doctype(doctype2, "Test Module") + workspace.append("links", { + "type": "Link", + "label": doctype2, + "only_for": country, + "link_type": "DocType", + "link_to": doctype2 + }) + +def create_doctype(doctype_name, module): + frappe.get_doc({ + 'doctype': 'DocType', + 'name': doctype_name, + 'module': module, + 'custom': 1, + 'autoname': 'field:title', + 'fields': [ + {'label': 'Title', 'fieldname': 'title', 'reqd': 1, 'fieldtype': 'Data'}, + {'label': 'Description', 'fieldname': 'description', 'fieldtype': 'Small Text'}, + {'label': 'Date', 'fieldname': 'date', 'fieldtype': 'Date'}, + {'label': 'Duration', 'fieldname': 'duration', 'fieldtype': 'Duration'}, + {'label': 'Number', 'fieldname': 'number', 'fieldtype': 'Int'}, + {'label': 'Number', 'fieldname': 'another_number', 'fieldtype': 'Int'} + ], + 'permissions': [ + {'role': 'System Manager'} + ] + }).insert(ignore_if_duplicate = True) \ No newline at end of file From 4a05697cfe061362f9c6d61047d6bfbda758f89f Mon Sep 17 00:00:00 2001 From: shariquerik Date: Mon, 19 Jul 2021 11:04:12 +0530 Subject: [PATCH 068/306] fix: Role based access to workspace --- frappe/boot.py | 4 +- frappe/desk/desktop.py | 81 ++++++++++--------- frappe/desk/doctype/workspace/workspace.json | 13 ++- frappe/desk/doctype/workspace/workspace.py | 44 ++++------ frappe/patches/v13_0/update_workspace2.py | 3 +- .../js/frappe/views/workspace/workspace.js | 50 ++++++++---- 6 files changed, 108 insertions(+), 87 deletions(-) diff --git a/frappe/boot.py b/frappe/boot.py index 1bcdca6a65..c46709d3d7 100644 --- a/frappe/boot.py +++ b/frappe/boot.py @@ -105,8 +105,8 @@ def load_conf_settings(bootinfo): if key in conf: bootinfo[key] = conf.get(key) def load_desktop_data(bootinfo): - from frappe.desk.doctype.workspace.workspace import get_pages - bootinfo.allowed_workspaces = get_pages().get('pages') + from frappe.desk.desktop import get_wspace_sidebar_items + bootinfo.allowed_workspaces = get_wspace_sidebar_items().get('pages') bootinfo.module_page_map = get_controller("Workspace").get_module_page_map() bootinfo.dashboards = frappe.get_all("Dashboard") diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index ac0db1b2d3..14b735db10 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -3,10 +3,10 @@ # Author - Shivam Mishra import frappe -import json from json import loads, dumps from frappe import _, DoesNotExistError, ValidationError, _dict from frappe.boot import get_allowed_pages, get_allowed_reports +from frappe.core.doctype.custom_role.custom_role import get_custom_allowed_roles from functools import wraps from frappe.cache_manager import ( build_domain_restriced_doctype_cache, @@ -35,13 +35,14 @@ class Workspace: self.extended_links = [] self.extended_charts = [] self.extended_shortcuts = [] + self.workspace_manager = "Workspace Manager" in frappe.get_roles() self.user = frappe.get_user() self.allowed_modules = self.get_cached('user_allowed_modules', self.get_allowed_modules) - self.doc = self.get_page_for_user() + self.doc = frappe.get_cached_doc("Workspace", self.page_name) - if self.doc.module and self.doc.module not in self.allowed_modules: + if self.doc and self.doc.module and self.doc.module not in self.allowed_modules and not self.workspace_manager: raise frappe.PermissionError self.can_read = self.get_cached('user_perm_can_read', self.get_can_read_items) @@ -58,8 +59,8 @@ class Workspace: self.restricted_pages = frappe.cache().get_value("domain_restricted_pages") or build_domain_restriced_page_cache() def is_page_allowed(self): - cards = self.doc.get_link_groups() + get_custom_reports_and_doctypes(self.doc.module) + self.extended_links - shortcuts = self.doc.shortcuts + self.extended_shortcuts + cards = self.doc.get_link_groups() + get_custom_reports_and_doctypes(self.doc.module) + shortcuts = self.doc.shortcuts for section in cards: links = loads(section.get('links')) if isinstance(section.get('links'), str) else section.get('links') @@ -77,8 +78,28 @@ class Workspace: if self.is_item_allowed(item.link_to, item.type) and _in_active_domains(item): return True + if not shortcuts and not self.doc.links: + return True + return False + def is_permitted(self): + """Returns true if Has Role is not set or the user is allowed.""" + from frappe.utils import has_common + + allowed = [d.role for d in frappe.get_all("Has Role", fields=["role"], filters={"parent": self.doc.name})] + + custom_roles = get_custom_allowed_roles('page', self.doc.name) + allowed.extend(custom_roles) + + if not allowed: + return True + + roles = frappe.get_roles() + + if has_common(roles, allowed): + return True + def get_cached(self, cache_key, fallback_fn): _cache = frappe.cache() @@ -104,24 +125,6 @@ class Workspace: return self.user.allow_modules - def get_page_for_user(self): - if self.public_page: - filters = { - 'label': self.page_name, - 'public': 1 - } - public_pages = frappe.get_all("Workspace", filters=filters, limit=1) - if public_pages: - return frappe.get_cached_doc("Workspace", public_pages[0]) - - filters = { - 'label': self.page_title + "-" + frappe.session.user, - 'for_user': frappe.session.user - } - user_pages = frappe.get_all("Workspace", filters=filters, limit=1) - if user_pages: - return frappe.get_cached_doc("Workspace", user_pages[0]) - def get_onboarding_doc(self): # Check if onboarding is enabled if not frappe.get_system_settings("enable_onboarding"): @@ -372,39 +375,45 @@ def get_desktop_page(page): return {} @frappe.whitelist() -def get_desk_sidebar_items(): +def get_wspace_sidebar_items(): """Get list of sidebar items for desk""" + has_access = "Workspace Manager" in frappe.get_roles() # don't get domain restricted pages blocked_modules = frappe.get_doc('User', frappe.session.user).get_blocked_modules() + blocked_modules.append('Dummy Module') filters = { 'restrict_to_domain': ['in', frappe.get_active_domains()], - 'extends_another_page': 0, - 'for_user': '', 'module': ['not in', blocked_modules] } - if not frappe.local.conf.developer_mode: - filters['developer_mode_only'] = '0' + if has_access: + filters = [] - # pages sorted based on pinned to top and then by name - order_by = "pin_to_top desc, pin_to_bottom asc, name asc" - all_pages = frappe.get_all("Workspace", fields=["name", "title", "public", "module", "icon"], - filters=filters, order_by=order_by, ignore_permissions=True) + # pages sorted based on sequence id + order_by = "sequence_id asc" + fields = ["name", "title", "for_user", "parent_page", "content", "public", "module", "icon"] + all_pages = frappe.get_all("Workspace", fields=fields, filters=filters, order_by=order_by, ignore_permissions=True) pages = [] + private_pages = [] # Filter Page based on Permission for page in all_pages: try: wspace = Workspace(page) - if wspace.is_page_allowed(): - pages.append(page) + if wspace.is_permitted() and wspace.is_page_allowed() or has_access: + if page.public: + pages.append(page) + elif page.for_user == frappe.session.user: + private_pages.append(page) page['label'] = _(page.get('name')) except frappe.PermissionError: pass + if private_pages: + pages.extend(private_pages) - return pages + return {'pages': pages, 'has_access': has_access} def get_table_with_counts(): counts = frappe.cache().get_value("information_schema:counts") @@ -575,7 +584,7 @@ def clean_up(original_page, blocks): for wid in ['shortcut', 'card', 'chart']: # get list of widget's name from blocks - page_widgets[wid] = [x['data'][wid + '_name'] for x in json.loads(blocks) if x['type'] == wid] + page_widgets[wid] = [x['data'][wid + '_name'] for x in loads(blocks) if x['type'] == wid] # shortcut & chart cleanup for wid in ['shortcut', 'chart']: diff --git a/frappe/desk/doctype/workspace/workspace.json b/frappe/desk/doctype/workspace/workspace.json index b531274884..8d95c9987f 100644 --- a/frappe/desk/doctype/workspace/workspace.json +++ b/frappe/desk/doctype/workspace/workspace.json @@ -38,7 +38,8 @@ "shortcuts", "section_break_18", "cards_label", - "links" + "links", + "roles" ], "fields": [ { @@ -252,10 +253,16 @@ "fieldname": "sequence_id", "fieldtype": "Int", "label": "Sequence Id" + }, + { + "fieldname": "roles", + "fieldtype": "Table", + "label": "Roles", + "options": "Has Role" } ], "links": [], - "modified": "2021-07-05 17:41:36.272294", + "modified": "2021-07-15 14:20:37.623926", "modified_by": "Administrator", "module": "Desk", "name": "Workspace", @@ -269,7 +276,7 @@ "print": 1, "read": 1, "report": 1, - "role": "System Manager", + "role": "Workspace Manager", "share": 1, "write": 1 }, diff --git a/frappe/desk/doctype/workspace/workspace.py b/frappe/desk/doctype/workspace/workspace.py index 93a7b13d17..2305155592 100644 --- a/frappe/desk/doctype/workspace/workspace.py +++ b/frappe/desk/doctype/workspace/workspace.py @@ -3,7 +3,6 @@ # For license information, please see license.txt import frappe -import json from frappe import _ from frappe.modules.export_file import export_to_files from frappe.model.document import Document @@ -26,8 +25,8 @@ class Workspace(Document): frappe.throw(_("You can only have one default page that extends a particular standard page.")) def on_update(self): - # if disable_saving_as_standard(): - # return + if disable_saving_as_standard(): + return if frappe.conf.developer_mode and self.module and self.public: export_to_files(record_list=[['Workspace', self.name]], record_module=self.module) @@ -159,20 +158,7 @@ def get_report_type(report): @frappe.whitelist() -def get_pages(): - has_access = "System Manager" in frappe.get_roles() - fields = ['name', 'title', 'icon', 'public', 'parent_page', 'content'] - - pages = get_page_list(fields, {'public': 1}) - private_pages = get_page_list(fields, {'for_user': frappe.session.user}) - - if private_pages: - pages.extend(private_pages) - - return {'pages': pages, 'has_access': has_access} - -@frappe.whitelist() -def save_page(title, parent, public, sb_items, deleted_pages, new_widgets, blocks, save): +def save_page(title, parent, public, sb_public_items, sb_private_items, deleted_pages, new_widgets, blocks, save): save = frappe.parse_json(save) public = frappe.parse_json(public) if save: @@ -206,20 +192,20 @@ def save_page(title, parent, public, sb_items, deleted_pages, new_widgets, block doc.content = blocks doc.save(ignore_permissions=True) - if json.loads(new_widgets): + if loads(new_widgets): save_new_widget(doc, title, blocks, new_widgets) - if json.loads(sb_items): - sort_pages(json.loads(sb_items)) + if loads(sb_public_items) or loads(sb_private_items): + sort_pages(loads(sb_public_items), loads(sb_private_items)) - if json.loads(deleted_pages): - return delete_pages(json.loads(deleted_pages)) + if loads(deleted_pages): + return delete_pages(loads(deleted_pages)) return {"name": title, "public": public} def delete_pages(deleted_pages): for page in deleted_pages: - if page.get("public") and "System Manager" not in frappe.get_roles(): + if page.get("public") and "Workspace Manager" not in frappe.get_roles(): return {"name": page.get("title"), "public": 1} if frappe.db.exists("Workspace", page.get("name")): @@ -227,17 +213,15 @@ def delete_pages(deleted_pages): return {"name": "Home", "public": 1} -def sort_pages(sb_items): - public_pages = [page for page in sb_items if page.get('public')=='1'] - private_pages = [page for page in sb_items if page.get('public')=='0'] - +def sort_pages(sb_public_items, sb_private_items): wspace_public_pages = get_page_list(['name', 'title'], {'public': 1}) wspace_private_pages = get_page_list(['name', 'title'], {'for_user': frappe.session.user}) - sort_page(wspace_private_pages, private_pages) + if sb_private_items: + sort_page(wspace_private_pages, sb_private_items) - if "System Manager" in frappe.get_roles(): - sort_page(wspace_public_pages, public_pages) + if sb_public_items and "Workspace Manager" in frappe.get_roles(): + sort_page(wspace_public_pages, sb_public_items) def sort_page(wspace_pages, pages): for seq, d in enumerate(pages): diff --git a/frappe/patches/v13_0/update_workspace2.py b/frappe/patches/v13_0/update_workspace2.py index 3561a8ff3e..53abe2994b 100644 --- a/frappe/patches/v13_0/update_workspace2.py +++ b/frappe/patches/v13_0/update_workspace2.py @@ -24,7 +24,8 @@ def create_content(doc): del doc.charts[doc.charts.index(l)] if doc.shortcuts: invalid_links = [] - content.append({"type":"spacer","data":{"col":12,"pt":0,"pr":0,"pb":0,"pl":0}}) + if doc.charts: + content.append({"type":"spacer","data":{"col":12,"pt":0,"pr":0,"pb":0,"pl":0}}) content.append({"type":"header","data":{"text":doc.shortcuts_label or _("Your Shortcuts"),"level":4,"col":12,"pt":0,"pr":0,"pb":0,"pl":0}}) for s in doc.shortcuts: if s.get_invalid_links()[0]: diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index c65c8aa232..512a56c1d1 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -22,7 +22,8 @@ frappe.views.Workspace = class Workspace { this.page = wrapper.page; this.isReadOnly = true; this.new_page = null; - this.sorted_sidebar_items = []; + this.sorted_public_items = []; + this.sorted_private_items = []; this.deleted_sidebar_items = []; this.current_page = {}; this.sidebar_items = { @@ -30,8 +31,8 @@ frappe.views.Workspace = class Workspace { 'private': {} }; this.sidebar_categories = [ - "Public", - frappe.user.first_name() + 'Public', + frappe.user.first_name() || 'Private' ]; this.tools = { header: { @@ -113,7 +114,7 @@ frappe.views.Workspace = class Workspace { } get_pages() { - return frappe.xcall("frappe.desk.doctype.workspace.workspace.get_pages"); + return frappe.xcall("frappe.desk.desktop.get_wspace_sidebar_items"); } sidebar_item_container(item) { @@ -124,7 +125,7 @@ frappe.views.Workspace = class Workspace { href="/app/${item.public ? frappe.router.slug(item.title) : 'private/'+frappe.router.slug(item.title) }" class="item-anchor ${item.is_editable ? "" : "block-click" }" title="${item.title}" > - ${frappe.utils.icon(item.icon || "folder-normal", "md")} + ${frappe.utils.icon(item.icon || "folder-normal", "md")} ${item.title}
@@ -146,7 +147,9 @@ frappe.views.Workspace = class Workspace { this.build_sidebar_section(category, root_pages); }); - this.sidebar.find('.selected')[0].scrollIntoView(); + // Scroll sidebar to selected page if it is not in viewport. + !frappe.dom.is_element_in_viewport(this.sidebar.find('.selected')) + && this.sidebar.find('.selected')[0].scrollIntoView(); } build_sidebar_section(title, root_pages) { @@ -448,26 +451,36 @@ frappe.views.Workspace = class Workspace { animation: 150, fallbackOnBody: true, swapThreshold: 0.65, - onEnd: function () { - me.prepare_sorted_sidebar(); + onEnd: function (evt) { + let is_public = $(evt.item).attr('item-public') == '1'; + me.prepare_sorted_sidebar(is_public); } }); }); } - prepare_sorted_sidebar() { - this.sorted_sidebar_items = []; - for (let page of $('.standard-sidebar-section').find('.sidebar-item-container')) { + prepare_sorted_sidebar(is_public) { + if (is_public) { + this.sorted_public_items = this.sort_sidebar(this.sidebar.find('.standard-sidebar-section').first()); + } else { + this.sorted_private_items = this.sort_sidebar(this.sidebar.find('.standard-sidebar-section').last()); + } + } + + sort_sidebar($sidebar_section) { + let sorted_items = []; + for (let page of $sidebar_section.find('.sidebar-item-container')) { let parent_page = ""; if (page.closest('.nested-container').classList.contains('sidebar-child-item')) { parent_page = page.parentElement.parentElement.attributes["item-name"].value; } - this.sorted_sidebar_items.push({ + sorted_items.push({ title: page.attributes['item-name'].value, parent_page: parent_page, public: page.attributes['item-public'].value }); } + return sorted_items; } make_blocks_sortable() { @@ -542,11 +555,16 @@ frappe.views.Workspace = class Workspace { this.show_sidebar_actions(); this.make_sidebar_sortable(); this.make_blocks_sortable(); - this.prepare_sorted_sidebar(); + this.prepare_sorted_sidebar(values.is_public); }); } }); d.show(); + + // to enable focusing on input field when modal is open. + d.$wrapper.on('shown.bs.modal', function() { + $(document).off('focusin.modal'); + }); } validate_page(values) { @@ -652,7 +670,8 @@ frappe.views.Workspace = class Workspace { title: me.title, parent: me.parent || '', public: me.public || 0, - sb_items: me.sorted_sidebar_items, + sb_public_items: me.sorted_public_items, + sb_private_items: me.sorted_private_items, deleted_pages: me.deleted_sidebar_items, new_widgets: new_widgets, blocks: JSON.stringify(outputData.blocks), @@ -666,7 +685,8 @@ frappe.views.Workspace = class Workspace { me.title = ''; me.parent = ''; me.public = false; - me.sorted_sidebar_items = []; + me.sorted_public_items = []; + me.sorted_private_items = []; me.deleted_sidebar_items = []; me.reload(); } From 8739b5e3add42abb47893d013f4700ef4dbc82b2 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 20 Jul 2021 16:33:13 +0530 Subject: [PATCH 069/306] fix: Added Onboarding Block --- frappe/desk/desktop.py | 47 ++++--- .../onboarding_step/onboarding_step.py | 18 ++- frappe/patches/v13_0/update_workspace2.py | 3 +- .../js/frappe/views/workspace/blocks/index.js | 2 + .../views/workspace/blocks/onboarding.js | 128 ++++++++++++++++++ .../js/frappe/views/workspace/workspace.js | 7 + .../public/js/frappe/widgets/base_widget.js | 6 +- .../js/frappe/widgets/onboarding_widget.js | 49 ++++++- .../public/js/frappe/widgets/widget_dialog.js | 19 +++ 9 files changed, 254 insertions(+), 25 deletions(-) create mode 100644 frappe/public/js/frappe/views/workspace/blocks/onboarding.js diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index 14b735db10..e2bc851aad 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -51,8 +51,9 @@ class Workspace: self.allowed_reports = get_allowed_reports(cache=True) if not minimal: - self.onboarding_doc = self.get_onboarding_doc() - self.onboarding = None + if self.doc.content: + self.onboarding_list = [x['data']['onboarding_name'] for x in loads(self.doc.content) if x['type'] == 'onboarding'] + self.onboardings = [] self.table_counts = get_table_with_counts() self.restricted_doctypes = frappe.cache().get_value("domain_restricted_doctypes") or build_domain_restriced_doctype_cache() @@ -125,18 +126,18 @@ class Workspace: return self.user.allow_modules - def get_onboarding_doc(self): + def get_onboarding_doc(self, onboarding): # Check if onboarding is enabled if not frappe.get_system_settings("enable_onboarding"): return None - if not self.doc.onboarding: + if not self.onboarding_list: return None - if frappe.db.get_value("Module Onboarding", self.doc.onboarding, "is_complete"): + if frappe.db.get_value("Module Onboarding", onboarding, "is_complete"): return None - doc = frappe.get_doc("Module Onboarding", self.doc.onboarding) + doc = frappe.get_doc("Module Onboarding", onboarding) # Check if user is allowed allowed_roles = set(doc.get_allowed_roles()) @@ -200,14 +201,9 @@ class Workspace: 'items': self.get_shortcuts() } - if self.onboarding_doc: - self.onboarding = { - 'label': _(self.onboarding_doc.title), - 'subtitle': _(self.onboarding_doc.subtitle), - 'success': _(self.onboarding_doc.success_message), - 'docs_url': self.onboarding_doc.documentation_url, - 'items': self.get_onboarding_steps() - } + self.onboardings = { + 'items': self.get_onboardings() + } def _doctype_contains_a_record(self, name): exists = self.table_counts.get(name, False) @@ -336,9 +332,26 @@ class Workspace: return items @handle_not_exist - def get_onboarding_steps(self): + def get_onboardings(self): + if self.onboarding_list: + for onboarding in self.onboarding_list: + onboarding_doc = self.get_onboarding_doc(onboarding) + if onboarding_doc: + item = { + 'label': _(onboarding), + 'title': _(onboarding_doc.title), + 'subtitle': _(onboarding_doc.subtitle), + 'success': _(onboarding_doc.success_message), + 'docs_url': onboarding_doc.documentation_url, + 'items': self.get_onboarding_steps(onboarding_doc) + } + self.onboardings.append(item) + return self.onboardings + + @handle_not_exist + def get_onboarding_steps(self, onboarding_doc): steps = [] - for doc in self.onboarding_doc.get_steps(): + for doc in onboarding_doc.get_steps(): step = doc.as_dict().copy() step.label = _(doc.title) if step.action == "Create Entry": @@ -367,7 +380,7 @@ def get_desktop_page(page): 'charts': wspace.charts, 'shortcuts': wspace.shortcuts, 'cards': wspace.cards, - 'onboarding': wspace.onboarding, + 'onboardings': wspace.onboardings, 'allow_customization': not wspace.doc.disable_user_customization } except DoesNotExistError: diff --git a/frappe/desk/doctype/onboarding_step/onboarding_step.py b/frappe/desk/doctype/onboarding_step/onboarding_step.py index 10bd8926ce..2336ff52f8 100644 --- a/frappe/desk/doctype/onboarding_step/onboarding_step.py +++ b/frappe/desk/doctype/onboarding_step/onboarding_step.py @@ -2,10 +2,26 @@ # Copyright (c) 2020, Frappe Technologies and contributors # For license information, please see license.txt -# import frappe +import frappe +from frappe import _ +import json from frappe.model.document import Document class OnboardingStep(Document): def before_export(self, doc): doc.is_complete = 0 doc.is_skipped = 0 + + +@frappe.whitelist() +def get_onboarding_steps(ob_steps): + steps = [] + for s in json.loads(ob_steps): + doc = frappe.get_doc('Onboarding Step', s.get('step')) + step = doc.as_dict().copy() + step.label = _(doc.title) + if step.action == "Create Entry": + step.is_submittable = frappe.db.get_value("DocType", step.reference_document, 'is_submittable', cache=True) + steps.append(step) + + return steps diff --git a/frappe/patches/v13_0/update_workspace2.py b/frappe/patches/v13_0/update_workspace2.py index 53abe2994b..f5f54fc7ee 100644 --- a/frappe/patches/v13_0/update_workspace2.py +++ b/frappe/patches/v13_0/update_workspace2.py @@ -13,6 +13,8 @@ def execute(): def create_content(doc): content = [] + if doc.onboarding: + content.append({"type":"onboarding","data":{"onboarding_name":doc.onboarding,"col":12,"pt":0,"pr":0,"pb":0,"pl":0}}) if doc.charts: invalid_links = [] for c in doc.charts: @@ -55,7 +57,6 @@ def update_wspace(doc, seq, content): doc.title = doc.extends doc.extends = '' doc.category = '' - doc.restrict_to_domain = '' doc.onboarding = '' doc.extends_another_page = 0 doc.is_default = 0 diff --git a/frappe/public/js/frappe/views/workspace/blocks/index.js b/frappe/public/js/frappe/views/workspace/blocks/index.js index d8b303133f..00a9b8c83a 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/index.js +++ b/frappe/public/js/frappe/views/workspace/blocks/index.js @@ -5,6 +5,7 @@ import Card from "./card"; import Chart from "./chart"; import Shortcut from "./shortcut"; import Spacer from "./spacer"; +import Onboarding from "./onboarding"; // import tunes import SpacingTune from "./spacing_tune"; @@ -18,6 +19,7 @@ frappe.wspace_block.blocks = { chart: Chart, shortcut: Shortcut, spacer: Spacer, + onboarding: Onboarding, }; frappe.wspace_block.tunes = { diff --git a/frappe/public/js/frappe/views/workspace/blocks/onboarding.js b/frappe/public/js/frappe/views/workspace/blocks/onboarding.js new file mode 100644 index 0000000000..8c8892c903 --- /dev/null +++ b/frappe/public/js/frappe/views/workspace/blocks/onboarding.js @@ -0,0 +1,128 @@ +import get_dialog_constructor from "../../../widgets/widget_dialog.js"; +import Block from "./block.js"; +export default class Onboarding extends Block { + static get toolbox() { + return { + title: 'Onboarding', + icon: '' + }; + } + + static get isReadOnlySupported() { + return true; + } + + constructor({ data, api, config, readOnly, block }) { + super({ data, api, config, readOnly, block }); + this.col = this.data.col ? this.data.col : "12"; + this.pt = this.data.pt ? this.data.pt : "0"; + this.pr = this.data.pr ? this.data.pr : "0"; + this.pb = this.data.pb ? this.data.pb : "0"; + this.pl = this.data.pl ? this.data.pl : "0"; + this.allow_customization = !this.readOnly; + this.options = { + allow_sorting: this.allow_customization, + allow_create: this.allow_customization, + allow_delete: this.allow_customization, + allow_hiding: false, + allow_edit: true + }; + } + + new(block, widget_type = block) { + const dialog_class = get_dialog_constructor(widget_type); + let block_name = block+'_name'; + this.dialog = new dialog_class({ + label: this.label, + type: widget_type, + primary_action: (widget) => { + widget.in_customize_mode = 1; + this.block_widget = frappe.widget.make_widget({ + ...widget, + widget_type: widget_type, + container: this.wrapper, + options: { + ...this.options, + on_delete: () => this.api.blocks.delete(), + on_edit: () => this.on_edit(this.block_widget) + }, + new: true + }); + this.block_widget.customize(this.options); + this.wrapper.setAttribute(block_name, this.block_widget.label || this.block_widget.onboarding_name); + this.new_block_widget = this.block_widget.get_config(); + this.add_tune_button(); + }, + }); + + if (!this.readOnly && this.data && !this.data[block_name]) { + this.dialog.make(); + } + } + + make(block, block_name) { + let block_data = this.config.page_data['onboardings'].items.find(obj => { + return obj.label == block_name; + }); + if (!block_data) return false; + this.wrapper.innerHTML = ''; + block_data.in_customize_mode = !this.readOnly; + this.block_widget = frappe.widget.make_widget({ + container: this.wrapper, + widget_type: 'onboarding', + in_customize_mode: block_data.in_customize_mode, + options: { + ...this.options, + on_delete: () => this.api.blocks.delete(), + on_edit: () => this.on_edit(this.block_widget) + }, + label: block_data.label, + title: block_data.title || __("Let's Get Started"), + subtitle: block_data.subtitle, + steps: block_data.items, + success: block_data.success, + docs_url: block_data.docs_url, + user_can_dismiss: block_data.user_can_dismiss, + }); + this.wrapper.setAttribute(block+'_name', block_name); + if (!this.readOnly) { + this.block_widget.customize(this.options); + } + return true; + } + + render() { + this.wrapper = document.createElement('div'); + this.new('onboarding'); + + if (this.data && this.data.onboarding_name) { + let has_data = this.make('onboarding', this.data.onboarding_name); + if (!has_data) return; + } + + if (!this.readOnly) { + this.add_tune_button(); + } + return this.wrapper; + } + + validate(savedData) { + if (!savedData.onboarding_name) { + return false; + } + + return true; + } + + save(blockContent) { + return { + onboarding_name: blockContent.getAttribute('onboarding_name'), + col: this.get_col(), + pt: this.get_padding("t"), + pr: this.get_padding("r"), + pb: this.get_padding("b"), + pl: this.get_padding("l"), + new: this.new_block_widget + }; + } +} \ No newline at end of file diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index 512a56c1d1..14540e5111 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -61,6 +61,12 @@ frappe.views.Workspace = class Workspace { page_data: this.page_data || [] } }, + onboarding: { + class: frappe.wspace_block.blocks['onboarding'], + config: { + page_data: this.page_data || [] + } + }, spacer: frappe.wspace_block.blocks['spacer'], spacingTune: frappe.wspace_block.tunes['spacing_tune'], }; @@ -323,6 +329,7 @@ frappe.views.Workspace = class Workspace { this.editor.configuration.tools.chart.config.page_data = this.page_data; this.editor.configuration.tools.shortcut.config.page_data = this.page_data; this.editor.configuration.tools.card.config.page_data = this.page_data; + this.editor.configuration.tools.onboarding.config.page_data = this.page_data; this.editor.render({ blocks: this.content || [] }); }); } else { diff --git a/frappe/public/js/frappe/widgets/base_widget.js b/frappe/public/js/frappe/widgets/base_widget.js index 90a2c1e641..bfb0371bd3 100644 --- a/frappe/public/js/frappe/widgets/base_widget.js +++ b/frappe/public/js/frappe/widgets/base_widget.js @@ -127,7 +127,7 @@ export default class Widget { } set_title(max_chars) { - let base = this.label || this.name; + let base = this.title || this.label || this.name; let title = max_chars ? frappe.ellipsis(base, max_chars) : base; if (this.icon) { @@ -136,7 +136,7 @@ export default class Widget { } else { this.title_field[0].innerHTML = title; if (max_chars) { - this.title_field[0].setAttribute('title', this.label); + this.title_field[0].setAttribute('title', this.title || this.label); } } this.subtitle && this.subtitle_field.html(this.subtitle); @@ -169,7 +169,7 @@ export default class Widget { primary_action: (data) => { Object.assign(this, data); data.name = this.name; - + this.new = true; this.refresh(); this.options.on_edit && this.options.on_edit(data); }, diff --git a/frappe/public/js/frappe/widgets/onboarding_widget.js b/frappe/public/js/frappe/widgets/onboarding_widget.js index b487c0134f..259bf9bc69 100644 --- a/frappe/public/js/frappe/widgets/onboarding_widget.js +++ b/frappe/public/js/frappe/widgets/onboarding_widget.js @@ -3,7 +3,23 @@ import Widget from "./base_widget.js"; frappe.provide("frappe.utils"); export default class OnboardingWidget extends Widget { + + async refresh() { + this.new && await this.get_onboarding_data(); + this.set_title(); + this.set_actions(); + this.set_body(); + this.setup_events(); + } + + get_config() { + return { + label: this.onboarding_name + }; + } + make_body() { + this.body.empty(); this.steps_wrapper = $(`
`).appendTo(this.body); this.step_preview = $(`
@@ -477,11 +493,13 @@ export default class OnboardingWidget extends Widget { } is_dismissed() { + if (this.in_customize_mode) return false; + let dismissed = JSON.parse( localStorage.getItem("dismissed-onboarding") || "{}" ); - if (Object.keys(dismissed).includes(this.label)) { - let last_hidden = new Date(dismissed[this.label]); + if (Object.keys(dismissed).includes(this.title)) { + let last_hidden = new Date(dismissed[this.title]); let today = new Date(); let diff = frappe.datetime.get_hour_diff(today, last_hidden); return diff < 24; @@ -490,6 +508,8 @@ export default class OnboardingWidget extends Widget { } set_actions() { + if (this.in_customize_mode) return; + this.action_area.empty(); const dismiss = $( `
${__('Dismiss', null, 'Stop showing the onboarding widget.')}
` @@ -498,7 +518,7 @@ export default class OnboardingWidget extends Widget { let dismissed = JSON.parse( localStorage.getItem("dismissed-onboarding") || "{}" ); - dismissed[this.label] = frappe.datetime.now_datetime(); + dismissed[this.title] = frappe.datetime.now_datetime(); localStorage.setItem( "dismissed-onboarding", @@ -508,4 +528,27 @@ export default class OnboardingWidget extends Widget { }); dismiss.appendTo(this.action_area); } + + get_onboarding_data() { + return frappe.model + .with_doc("Module Onboarding", this.onboarding_name) + .then(onboarding_doc => { + if (onboarding_doc) { + this.onboarding_doc = onboarding_doc; + this.label = onboarding_doc.label; + this.title = onboarding_doc.title || __("Let's Get Started"); + this.subtitle = onboarding_doc.subtitle; + this.success = onboarding_doc.success; + this.docs_url = onboarding_doc.docs_url; + this.user_can_dismiss = onboarding_doc.user_can_dismiss; + const method = + "frappe.desk.doctype.onboarding_step.onboarding_step.get_onboarding_steps"; + return frappe + .xcall(method, { ob_steps: onboarding_doc.steps }) + .then(steps => { + this.steps = steps; + }); + } + }); + } } diff --git a/frappe/public/js/frappe/widgets/widget_dialog.js b/frappe/public/js/frappe/widgets/widget_dialog.js index a552efd216..9262627f02 100644 --- a/frappe/public/js/frappe/widgets/widget_dialog.js +++ b/frappe/public/js/frappe/widgets/widget_dialog.js @@ -124,6 +124,24 @@ class ChartDialog extends WidgetDialog { } } +class OnboardingDialog extends WidgetDialog { + constructor(opts) { + super(opts); + } + + get_fields() { + return [ + { + fieldtype: "Link", + fieldname: "onboarding_name", + label: "Onboarding Name", + options: "Module Onboarding", + reqd: 1, + } + ]; + } +} + class CardDialog extends WidgetDialog { constructor(opts) { super(opts); @@ -531,6 +549,7 @@ export default function get_dialog_constructor(type) { shortcut: ShortcutDialog, number_card: NumberCardDialog, links: CardDialog, + onboarding: OnboardingDialog }; return widget_map[type] || WidgetDialog; From 4a546942e4711ce5e25c78970faa8e4b016d9137 Mon Sep 17 00:00:00 2001 From: Kenneth Sequeira Date: Tue, 20 Jul 2021 20:09:18 +0530 Subject: [PATCH 070/306] fix: currency test --- frappe/tests/test_currency_formatter.py | 30 +++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 frappe/tests/test_currency_formatter.py diff --git a/frappe/tests/test_currency_formatter.py b/frappe/tests/test_currency_formatter.py new file mode 100644 index 0000000000..75cb42dc49 --- /dev/null +++ b/frappe/tests/test_currency_formatter.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +import frappe +from frappe import format +import unittest + +class TestFormatter(unittest.TestCase): + def test_custom_currency_formatting(self): + df = frappe._dict({ + 'fieldname': 'amount', + 'fieldtype': 'Currency', + 'options': 'currency' + }) + + doc = frappe._dict({ + 'amount': 5 + }) + frappe.db.set_default("currency", 'INR') + + # if currency field is not passed then default currency should be used. + print("doc.currency") + print(doc.currency) + print("frappe.db.get_default('currency')") + print(frappe.db.get_default("currency")) + + self.assertEqual(format(100000, df, doc, format="#,###.##"), '₹ 100,000.00') + + doc.currency = 'USD' + self.assertEqual(format(100000, df, doc, format="#,###.##"), "$ 100,000.00") + + frappe.db.set_default("currency", None) From e0e1c15d760e71c78ac2a415a91f69a491a7d4c4 Mon Sep 17 00:00:00 2001 From: Kenneth Sequeira Date: Tue, 20 Jul 2021 20:10:15 +0530 Subject: [PATCH 071/306] fix: remove redundant code --- frappe/tests/test_formatter.py | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/frappe/tests/test_formatter.py b/frappe/tests/test_formatter.py index cd7b8add9d..5257e1c717 100644 --- a/frappe/tests/test_formatter.py +++ b/frappe/tests/test_formatter.py @@ -22,29 +22,4 @@ class TestFormatter(unittest.TestCase): doc.currency = 'USD' self.assertEqual(format(100, df, doc), "$ 100.00") - frappe.db.set_default("currency", None) - - def test_custom_currency_formatting(self): - df = frappe._dict({ - 'fieldname': 'amount', - 'fieldtype': 'Currency', - 'options': 'currency' - }) - - doc = frappe._dict({ - 'amount': 5 - }) - frappe.db.set_default("currency", 'INR') - - # if currency field is not passed then default currency should be used. - print("doc.currency") - print(doc.currency) - print("frappe.db.get_default('currency')") - print(frappe.db.get_default("currency")) - - self.assertEqual(format(100000, df, doc, format="#,###.##"), '₹ 100,000.00') - - doc.currency = 'USD' - self.assertEqual(format(100000, df, doc, format="#,###.##"), "$ 100,000.00") - - frappe.db.set_default("currency", None) + frappe.db.set_default("currency", None) \ No newline at end of file From e7e8fcd6221dc662feb7b5421ef40f7eb7b9414d Mon Sep 17 00:00:00 2001 From: Kenneth Sequeira Date: Tue, 20 Jul 2021 20:32:24 +0530 Subject: [PATCH 072/306] fix: old currency test --- frappe/tests/test_currency_formatter.py | 4 ---- frappe/tests/test_formatter.py | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/frappe/tests/test_currency_formatter.py b/frappe/tests/test_currency_formatter.py index 75cb42dc49..c85f2d3c40 100644 --- a/frappe/tests/test_currency_formatter.py +++ b/frappe/tests/test_currency_formatter.py @@ -17,10 +17,6 @@ class TestFormatter(unittest.TestCase): frappe.db.set_default("currency", 'INR') # if currency field is not passed then default currency should be used. - print("doc.currency") - print(doc.currency) - print("frappe.db.get_default('currency')") - print(frappe.db.get_default("currency")) self.assertEqual(format(100000, df, doc, format="#,###.##"), '₹ 100,000.00') diff --git a/frappe/tests/test_formatter.py b/frappe/tests/test_formatter.py index 5257e1c717..701e81bb9a 100644 --- a/frappe/tests/test_formatter.py +++ b/frappe/tests/test_formatter.py @@ -20,6 +20,8 @@ class TestFormatter(unittest.TestCase): self.assertEqual(format(100, df, doc), '₹ 100.00') doc.currency = 'USD' + print('doc.currency') + print(doc.currency) self.assertEqual(format(100, df, doc), "$ 100.00") frappe.db.set_default("currency", None) \ No newline at end of file From 48d1d11656a61c737427dc7d488d5ce639b9ed15 Mon Sep 17 00:00:00 2001 From: Kenneth Sequeira Date: Tue, 20 Jul 2021 21:06:27 +0530 Subject: [PATCH 073/306] fix: modified original test --- frappe/tests/test_currency_formatter.py | 26 ------------------------- frappe/tests/test_formatter.py | 6 ++---- 2 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 frappe/tests/test_currency_formatter.py diff --git a/frappe/tests/test_currency_formatter.py b/frappe/tests/test_currency_formatter.py deleted file mode 100644 index c85f2d3c40..0000000000 --- a/frappe/tests/test_currency_formatter.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- -import frappe -from frappe import format -import unittest - -class TestFormatter(unittest.TestCase): - def test_custom_currency_formatting(self): - df = frappe._dict({ - 'fieldname': 'amount', - 'fieldtype': 'Currency', - 'options': 'currency' - }) - - doc = frappe._dict({ - 'amount': 5 - }) - frappe.db.set_default("currency", 'INR') - - # if currency field is not passed then default currency should be used. - - self.assertEqual(format(100000, df, doc, format="#,###.##"), '₹ 100,000.00') - - doc.currency = 'USD' - self.assertEqual(format(100000, df, doc, format="#,###.##"), "$ 100,000.00") - - frappe.db.set_default("currency", None) diff --git a/frappe/tests/test_formatter.py b/frappe/tests/test_formatter.py index 701e81bb9a..5454c2b1cd 100644 --- a/frappe/tests/test_formatter.py +++ b/frappe/tests/test_formatter.py @@ -17,11 +17,9 @@ class TestFormatter(unittest.TestCase): frappe.db.set_default("currency", 'INR') # if currency field is not passed then default currency should be used. - self.assertEqual(format(100, df, doc), '₹ 100.00') + self.assertEqual(format(100000, df, doc, format="#,###.##"), '₹ 100,000.00') doc.currency = 'USD' - print('doc.currency') - print(doc.currency) - self.assertEqual(format(100, df, doc), "$ 100.00") + self.assertEqual(format(100000, df, doc, format="#,###.##"), "$ 100,000.00") frappe.db.set_default("currency", None) \ No newline at end of file From d014084ae5f3b2d97a4ae9c3ff7f1f41f9bd7732 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Mon, 2 Aug 2021 20:23:44 +0530 Subject: [PATCH 074/306] fix: moved datetime logic to datetime.js --- frappe/public/js/frappe/form/controls/base_control.js | 4 +--- frappe/public/js/frappe/form/controls/datetime.js | 4 ++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/frappe/public/js/frappe/form/controls/base_control.js b/frappe/public/js/frappe/form/controls/base_control.js index ee40bbe43d..7977458ad7 100644 --- a/frappe/public/js/frappe/form/controls/base_control.js +++ b/frappe/public/js/frappe/form/controls/base_control.js @@ -162,9 +162,7 @@ frappe.ui.form.Control = class BaseControl { let force_value_set = (this.doc && this.doc.__run_link_triggers); let model_value = this.get_model_value(); - if (this.df && this.df.fieldtype == 'Datetime') { - model_value = frappe.datetime.get_datetime_as_string(model_value); - } + model_value = this.parse_model_value && this.parse_model_value(model_value); let is_value_same = (model_value === value); diff --git a/frappe/public/js/frappe/form/controls/datetime.js b/frappe/public/js/frappe/form/controls/datetime.js index 341a933066..7a3cef2304 100644 --- a/frappe/public/js/frappe/form/controls/datetime.js +++ b/frappe/public/js/frappe/form/controls/datetime.js @@ -36,4 +36,8 @@ frappe.ui.form.ControlDatetime = class ControlDatetime extends frappe.ui.form.Co $tp.$secondsText.prev().css('display', 'none'); } } + + parse_model_value(value) { + return frappe.datetime.get_datetime_as_string(value); + } }; From db55bec9563578fea84e8a57a5b934b4c06b9312 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 3 Aug 2021 18:07:36 +0530 Subject: [PATCH 075/306] fix: Update Parent Field option based on Public checkbox --- .../js/frappe/views/workspace/workspace.js | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index 14540e5111..a520fc6e9c 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -506,12 +506,9 @@ frappe.views.Workspace = class Workspace { } initialize_new_page() { - let parent_pages = this.private_pages.filter(page => !page.parent_page).map(page => page.title); - - if (this.has_access) { - parent_pages = this.all_pages.filter(page => !page.parent_page).map(page => page.title); - } - parent_pages.unshift(''); + this.public_parent_pages = ['', ...this.public_pages.filter(page => !page.parent_page).map(page => page.title)]; + this.private_parent_pages = ['', ...this.private_pages.filter(page => !page.parent_page).map(page => page.title)]; + var me = this; const d = new frappe.ui.Dialog({ title: __('Set Title'), fields: [ @@ -525,13 +522,17 @@ frappe.views.Workspace = class Workspace { label: __('Parent'), fieldtype: 'Select', fieldname: 'parent', - options: parent_pages + options: this.private_parent_pages }, { label: __('Public'), fieldtype: 'Check', fieldname: 'is_public', - depends_on: `eval:${this.has_access}` + depends_on: `eval:${this.has_access}`, + onchange: function() { + d.set_df_property('parent', 'options', + this.get_value() ? me.public_parent_pages : me.private_parent_pages); + } } ], primary_action_label: __('Create'), @@ -567,11 +568,6 @@ frappe.views.Workspace = class Workspace { } }); d.show(); - - // to enable focusing on input field when modal is open. - d.$wrapper.on('shown.bs.modal', function() { - $(document).off('focusin.modal'); - }); } validate_page(values) { From 6fdf522090fe0f89dcb8c2f35c19530c384b3035 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 4 Aug 2021 10:58:33 +0530 Subject: [PATCH 076/306] fix: Added Tooltip and UI fix when shrink any widget --- .../views/workspace/blocks/spacing_tune.js | 14 +++++++++- .../public/js/frappe/widgets/base_widget.js | 8 +++--- frappe/public/scss/desk/desktop.scss | 26 ++++++++++++------- 3 files changed, 33 insertions(+), 15 deletions(-) diff --git a/frappe/public/js/frappe/views/workspace/blocks/spacing_tune.js b/frappe/public/js/frappe/views/workspace/blocks/spacing_tune.js index 1cf6891071..d69f39c875 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/spacing_tune.js +++ b/frappe/public/js/frappe/views/workspace/blocks/spacing_tune.js @@ -34,6 +34,10 @@ export default class SpacingTune { // paddingButton.appendChild($.svg('padding', 15, 15)); paddingButton.innerHTML = ``; + this.api.tooltip.onHover(paddingButton, 'Padding', { + placement: 'top', + hidingDelay: 500, + }); this.api.listeners.on( paddingButton, 'click', @@ -43,6 +47,10 @@ export default class SpacingTune { // decreaseWidthButton.appendChild($.svg('decrease-width', 15, 15)); decreaseWidthButton.innerHTML = ``; + this.api.tooltip.onHover(decreaseWidthButton, 'Shrink', { + placement: 'top', + hidingDelay: 500, + }); this.api.listeners.on( decreaseWidthButton, 'click', @@ -52,6 +60,10 @@ export default class SpacingTune { // increaseWidthButton.appendChild(); increaseWidthButton.innerHTML = ``; + this.api.tooltip.onHover(increaseWidthButton, 'Expand', { + placement: 'top', + hidingDelay: 500, + }); this.api.listeners.on( increaseWidthButton, 'click', @@ -88,7 +100,7 @@ export default class SpacingTune { }); let parts = className.split('-'); let width = parseInt(parts[1]); - if (width >= 2) { + if (width >= 4) { currentBlockElement.classList.remove('col-'+width); width = width - 1; currentBlockElement.classList.add('col-'+width); diff --git a/frappe/public/js/frappe/widgets/base_widget.js b/frappe/public/js/frappe/widgets/base_widget.js index bfb0371bd3..83084e61b0 100644 --- a/frappe/public/js/frappe/widgets/base_widget.js +++ b/frappe/public/js/frappe/widgets/base_widget.js @@ -105,8 +105,8 @@ export default class Widget { ${ this.shadow ? "widget-shadow" : " " } " data-widget-name="${this.name ? this.name : ''}">
-
-
+
+
@@ -132,9 +132,9 @@ export default class Widget { if (this.icon) { let icon = frappe.utils.icon(this.icon); - this.title_field[0].innerHTML = `${icon} ${title}`; + this.title_field[0].innerHTML = `${icon} ${title}`; } else { - this.title_field[0].innerHTML = title; + this.title_field[0].innerHTML = `${title}`; if (max_chars) { this.title_field[0].setAttribute('title', this.title || this.label); } diff --git a/frappe/public/scss/desk/desktop.scss b/frappe/public/scss/desk/desktop.scss index 8644310e52..cb9f53e421 100644 --- a/frappe/public/scss/desk/desktop.scss +++ b/frappe/public/scss/desk/desktop.scss @@ -133,19 +133,25 @@ body { .widget-head { @include flex(flex, space-between, center, null); - .widget-title { - @include flex(flex, null, center, null); - font-size: var(--text-lg); - font-family: inherit; - font-weight: 500; - line-height: 1.3em; - color: var(--heading-color); + .widget-label { + min-width: 0px; - svg { - margin-right: 6px; - box-shadow: none; + .widget-title { + @include flex(flex, null, center, null); + font-size: var(--text-lg); + font-family: inherit; + font-weight: 500; + line-height: 1.3em; + color: var(--heading-color); + + svg { + flex: none; + margin-right: 6px; + box-shadow: none; + } } } + .widget-control { @include flex(flex, null, center, row-reverse); From 8c33f8172407e8935325d89a3e3eb6af4b520b1e Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 4 Aug 2021 12:23:30 +0530 Subject: [PATCH 077/306] fix: dragging shrinked block get expanded --- frappe/public/js/frappe/views/workspace/blocks/block.js | 4 ++-- frappe/public/js/frappe/views/workspace/blocks/header.js | 2 +- frappe/public/js/frappe/views/workspace/blocks/paragraph.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/public/js/frappe/views/workspace/blocks/block.js b/frappe/public/js/frappe/views/workspace/blocks/block.js index 8ae9610096..73569bf4c1 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/block.js +++ b/frappe/public/js/frappe/views/workspace/blocks/block.js @@ -30,7 +30,7 @@ export default class Block { rendered() { var e = this.wrapper.closest('.ce-block'); - e.classList.add("col-" + this.col); + e.classList.add("col-" + this.get_col()); e.classList.add("pt-" + this.pt); e.classList.add("pr-" + this.pr); e.classList.add("pb-" + this.pb); @@ -103,7 +103,7 @@ export default class Block { } get_col() { - let col = 12; + let col = this.col || 12; let class_name = "col-12"; let wrapper = this.wrapper.closest('.ce-block'); const col_class = new RegExp(/\bcol-.+?\b/, "g"); diff --git a/frappe/public/js/frappe/views/workspace/blocks/header.js b/frappe/public/js/frappe/views/workspace/blocks/header.js index 69c62056aa..0f03437298 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/header.js +++ b/frappe/public/js/frappe/views/workspace/blocks/header.js @@ -169,7 +169,7 @@ export default class Header extends Block { rendered() { var e = this._element.closest('.ce-block'); - e.classList.add("col-" + this.col); + e.classList.add("col-" + this.get_col()); e.classList.add("pt-" + this.pt); e.classList.add("pr-" + this.pr); e.classList.add("pb-" + this.pb); diff --git a/frappe/public/js/frappe/views/workspace/blocks/paragraph.js b/frappe/public/js/frappe/views/workspace/blocks/paragraph.js index 655f7c2c1e..9ee6d4bd03 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/paragraph.js +++ b/frappe/public/js/frappe/views/workspace/blocks/paragraph.js @@ -141,7 +141,7 @@ export default class Paragraph extends Block { rendered() { var e = this._element.closest('.ce-block'); - e.classList.add("col-" + this.col); + e.classList.add("col-" + this.get_col()); e.classList.add("pt-" + this.pt); e.classList.add("pr-" + this.pr); e.classList.add("pb-" + this.pb); From 0dbcc76f597c22e017b88dddc8995cae80a48f7a Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 4 Aug 2021 13:22:02 +0530 Subject: [PATCH 078/306] fix: double refresh while save and discard --- frappe/public/js/frappe/views/workspace/blocks/block.js | 2 +- frappe/public/js/frappe/views/workspace/workspace.js | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/views/workspace/blocks/block.js b/frappe/public/js/frappe/views/workspace/blocks/block.js index 73569bf4c1..fd8ad9f45f 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/block.js +++ b/frappe/public/js/frappe/views/workspace/blocks/block.js @@ -107,7 +107,7 @@ export default class Block { let class_name = "col-12"; let wrapper = this.wrapper.closest('.ce-block'); const col_class = new RegExp(/\bcol-.+?\b/, "g"); - if (wrapper.className.match(col_class)) { + if (wrapper && wrapper.className.match(col_class)) { wrapper.classList.forEach(function (cn) { cn.match(col_class) && (class_name = cn); }); diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index a520fc6e9c..019ddb2a42 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -702,6 +702,8 @@ frappe.views.Workspace = class Workspace { } reload() { + this.$page.prepend(frappe.render_template('workspace_loading_skeleton')); + this.$page.find('.codex-editor').addClass('hidden'); this.setup_pages(); this.undo.readOnly = true; } From 65794500a8e43046e067b4c9b59ddff99e514411 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 4 Aug 2021 16:42:33 +0530 Subject: [PATCH 079/306] fix: Implemented another way to Add New Block --- .../js/frappe/views/workspace/workspace.js | 29 ++++++++++++++----- frappe/public/scss/desk/desktop.scss | 1 + 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index 019ddb2a42..a1b9ae81dd 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -20,6 +20,7 @@ frappe.views.Workspace = class Workspace { constructor(wrapper) { this.wrapper = $(wrapper); this.page = wrapper.page; + this.blocks = frappe.wspace_block.blocks; this.isReadOnly = true; this.new_page = null; this.sorted_public_items = []; @@ -36,38 +37,38 @@ frappe.views.Workspace = class Workspace { ]; this.tools = { header: { - class: frappe.wspace_block.blocks['header'], + class: this.blocks['header'], inlineToolbar: true }, paragraph: { - class: frappe.wspace_block.blocks['paragraph'], + class: this.blocks['paragraph'], inlineToolbar: true }, chart: { - class: frappe.wspace_block.blocks['chart'], + class: this.blocks['chart'], config: { page_data: this.page_data || [] } }, card: { - class: frappe.wspace_block.blocks['card'], + class: this.blocks['card'], config: { page_data: this.page_data || [] } }, shortcut: { - class: frappe.wspace_block.blocks['shortcut'], + class: this.blocks['shortcut'], config: { page_data: this.page_data || [] } }, onboarding: { - class: frappe.wspace_block.blocks['onboarding'], + class: this.blocks['onboarding'], config: { page_data: this.page_data || [] } }, - spacer: frappe.wspace_block.blocks['spacer'], + spacer: this.blocks['spacer'], spacingTune: frappe.wspace_block.tunes['spacing_tune'], }; @@ -375,6 +376,7 @@ frappe.views.Workspace = class Workspace { } setup_customization_buttons(is_editable) { + let me = this; this.page.clear_primary_action(); this.page.clear_secondary_action(); this.page.clear_inner_toolbar(); @@ -398,6 +400,7 @@ frappe.views.Workspace = class Workspace { () => { this.page.clear_primary_action(); this.page.clear_secondary_action(); + this.page.clear_inner_toolbar(); this.editor.readOnly.toggle(); this.isReadOnly = true; this.deleted_sidebar_items = []; @@ -405,6 +408,16 @@ frappe.views.Workspace = class Workspace { frappe.show_alert({ message: __("Customizations Discarded"), indicator: "info" }); } ); + + Object.keys(this.blocks).forEach(key => { + this.page.add_inner_button(__(this.blocks[key].name), function() { + const index = me.editor.blocks.getBlocksCount() + 1; + let currentBlock = me.editor.blocks.getBlockByIndex(index - 1).holder; + me.editor.blocks.insert(key, {}, {}, index, true); + me.editor.caret.setToLastBlock('start', 0); + currentBlock.scrollIntoView(); + }, __('Add New Block')); + }); } show_sidebar_actions() { @@ -683,7 +696,6 @@ frappe.views.Workspace = class Workspace { callback: function(res) { frappe.dom.unfreeze(); if (res.message) { - frappe.show_alert({ message: __("Page Saved Successfully"), indicator: "green" }); me.new_page = res.message; me.title = ''; me.parent = ''; @@ -692,6 +704,7 @@ frappe.views.Workspace = class Workspace { me.sorted_private_items = []; me.deleted_sidebar_items = []; me.reload(); + frappe.show_alert({ message: __("Page Saved Successfully"), indicator: "green" }); } } }); diff --git a/frappe/public/scss/desk/desktop.scss b/frappe/public/scss/desk/desktop.scss index cb9f53e421..dc77f67fb1 100644 --- a/frappe/public/scss/desk/desktop.scss +++ b/frappe/public/scss/desk/desktop.scss @@ -972,6 +972,7 @@ body { .icon { stroke: none; width: fit-content; + height: fit-content; } .ce-settings { From a4fee548d6a560c1231d0a4b1d57a56467fb37f8 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 4 Aug 2021 17:35:13 +0530 Subject: [PATCH 080/306] fix: minor fix --- frappe/public/js/frappe/views/workspace/workspace.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index a1b9ae81dd..0d52d557f2 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -410,13 +410,12 @@ frappe.views.Workspace = class Workspace { ); Object.keys(this.blocks).forEach(key => { - this.page.add_inner_button(__(this.blocks[key].name), function() { + this.page.add_inner_button(__(this.blocks[key].toolbox.title), function() { const index = me.editor.blocks.getBlocksCount() + 1; - let currentBlock = me.editor.blocks.getBlockByIndex(index - 1).holder; me.editor.blocks.insert(key, {}, {}, index, true); me.editor.caret.setToLastBlock('start', 0); - currentBlock.scrollIntoView(); - }, __('Add New Block')); + $('.ce-block:last-child')[0].scrollIntoView(); + }, `${frappe.utils.icon('small-add', 'xs')} ${__('Add Block')}`); }); } From 66a91fc0143be67f6bb6da960c2fa3d12ff3fb7d Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 4 Aug 2021 19:00:00 +0530 Subject: [PATCH 081/306] fix: Added icons in Add Block Dropdown --- frappe/public/js/frappe/views/workspace/blocks/card.js | 2 +- .../public/js/frappe/views/workspace/blocks/onboarding.js | 2 +- frappe/public/js/frappe/views/workspace/workspace.js | 5 ++++- frappe/public/scss/desk/desktop.scss | 6 ++++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/frappe/public/js/frappe/views/workspace/blocks/card.js b/frappe/public/js/frappe/views/workspace/blocks/card.js index 6dd76b5c46..269952b504 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/card.js +++ b/frappe/public/js/frappe/views/workspace/blocks/card.js @@ -3,7 +3,7 @@ export default class Card extends Block { static get toolbox() { return { title: 'Card', - icon: '' + icon: '' }; } diff --git a/frappe/public/js/frappe/views/workspace/blocks/onboarding.js b/frappe/public/js/frappe/views/workspace/blocks/onboarding.js index 8c8892c903..8aaffef30b 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/onboarding.js +++ b/frappe/public/js/frappe/views/workspace/blocks/onboarding.js @@ -4,7 +4,7 @@ export default class Onboarding extends Block { static get toolbox() { return { title: 'Onboarding', - icon: '' + icon: '' }; } diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index 0d52d557f2..ca3728f0ef 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -410,7 +410,10 @@ frappe.views.Workspace = class Workspace { ); Object.keys(this.blocks).forEach(key => { - this.page.add_inner_button(__(this.blocks[key].toolbox.title), function() { + this.page.add_inner_button(` + ${this.blocks[key].toolbox.icon} + ${__(this.blocks[key].toolbox.title)} + `, function() { const index = me.editor.blocks.getBlocksCount() + 1; me.editor.blocks.insert(key, {}, {}, index, true); me.editor.caret.setToLastBlock('start', 0); diff --git a/frappe/public/scss/desk/desktop.scss b/frappe/public/scss/desk/desktop.scss index dc77f67fb1..c3c82aba07 100644 --- a/frappe/public/scss/desk/desktop.scss +++ b/frappe/public/scss/desk/desktop.scss @@ -793,6 +793,12 @@ body { } } + .block-item-icon svg{ + width: 12px; + height: 12px; + margin-right: 5px; + } + .standard-sidebar-item { justify-content: space-between; padding: 0px; From fc3033fbd694aff11a83eb6591ac0607851375c8 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 5 Aug 2021 11:22:47 +0530 Subject: [PATCH 082/306] fix: Page not rendered if different user logs in --- frappe/public/js/frappe/views/workspace/workspace.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index ca3728f0ef..be08f994f1 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -270,7 +270,7 @@ frappe.views.Workspace = class Workspace { get_page_to_show() { let default_page; - if (localStorage.current_page) { + if (localStorage.current_page && this.all_pages.filter(page => page.title == localStorage.current_page).length != 0) { default_page = { name: localStorage.current_page, public: localStorage.is_current_page_public == 'true' }; } else if (Object.keys(this.all_pages).length !== 0) { default_page = { name: this.all_pages[0].title, public: true }; From 63962d08c25df67ac774ce1915779b518809a684 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 5 Aug 2021 11:23:51 +0530 Subject: [PATCH 083/306] chore: better naming class name --- frappe/public/js/frappe/views/workspace/workspace.js | 4 ++-- frappe/public/scss/desk/desktop.scss | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index be08f994f1..845d1b826e 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -411,8 +411,8 @@ frappe.views.Workspace = class Workspace { Object.keys(this.blocks).forEach(key => { this.page.add_inner_button(` - ${this.blocks[key].toolbox.icon} - ${__(this.blocks[key].toolbox.title)} + ${this.blocks[key].toolbox.icon} + ${__(this.blocks[key].toolbox.title)} `, function() { const index = me.editor.blocks.getBlocksCount() + 1; me.editor.blocks.insert(key, {}, {}, index, true); diff --git a/frappe/public/scss/desk/desktop.scss b/frappe/public/scss/desk/desktop.scss index c3c82aba07..88dd7e14c2 100644 --- a/frappe/public/scss/desk/desktop.scss +++ b/frappe/public/scss/desk/desktop.scss @@ -793,7 +793,7 @@ body { } } - .block-item-icon svg{ + .block-menu-item-icon svg{ width: 12px; height: 12px; margin-right: 5px; From 744b4ec8a2dc137c08d6783524b2111412d6ad29 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 5 Aug 2021 12:15:12 +0530 Subject: [PATCH 084/306] fix: Added Icon Picker Field --- frappe/desk/doctype/workspace/workspace.json | 4 ++-- frappe/desk/doctype/workspace/workspace.py | 3 ++- .../js/frappe/views/workspace/workspace.js | 17 ++++++++++++++--- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/frappe/desk/doctype/workspace/workspace.json b/frappe/desk/doctype/workspace/workspace.json index 8d95c9987f..e2ae38faf1 100644 --- a/frappe/desk/doctype/workspace/workspace.json +++ b/frappe/desk/doctype/workspace/workspace.json @@ -206,7 +206,7 @@ }, { "fieldname": "icon", - "fieldtype": "Data", + "fieldtype": "Icon", "label": "Icon" }, { @@ -262,7 +262,7 @@ } ], "links": [], - "modified": "2021-07-15 14:20:37.623926", + "modified": "2021-08-05 11:49:09.028243", "modified_by": "Administrator", "module": "Desk", "name": "Workspace", diff --git a/frappe/desk/doctype/workspace/workspace.py b/frappe/desk/doctype/workspace/workspace.py index 2305155592..0821ae03c4 100644 --- a/frappe/desk/doctype/workspace/workspace.py +++ b/frappe/desk/doctype/workspace/workspace.py @@ -158,12 +158,13 @@ def get_report_type(report): @frappe.whitelist() -def save_page(title, parent, public, sb_public_items, sb_private_items, deleted_pages, new_widgets, blocks, save): +def save_page(title, icon, parent, public, sb_public_items, sb_private_items, deleted_pages, new_widgets, blocks, save): save = frappe.parse_json(save) public = frappe.parse_json(public) if save: doc = frappe.new_doc('Workspace') doc.title = title + doc.icon = icon doc.content = blocks doc.parent_page = parent diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index 845d1b826e..e315704e3d 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -548,7 +548,15 @@ frappe.views.Workspace = class Workspace { d.set_df_property('parent', 'options', this.get_value() ? me.public_parent_pages : me.private_parent_pages); } - } + }, + { + fieldtype: 'Column Break' + }, + { + label: __('Icon'), + fieldtype: 'Icon', + fieldname: 'icon' + }, ], primary_action_label: __('Create'), primary_action: (values) => { @@ -557,6 +565,7 @@ frappe.views.Workspace = class Workspace { this.initialize_editorjs_undo(); this.setup_customization_buttons(true); this.title = values.title; + this.icon = values.icon; this.parent = values.parent; this.public = values.is_public; this.editor.render({ @@ -602,10 +611,11 @@ frappe.views.Workspace = class Workspace { return true; } - add_page_to_sidebar({title, parent, is_public}) { + add_page_to_sidebar({title, icon, parent, is_public}) { let $sidebar = $('.standard-sidebar-section'); let item = { title: title, + icon: icon, parent_page: parent, public: is_public }; @@ -642,7 +652,6 @@ frappe.views.Workspace = class Workspace { $child_section.removeClass('hidden'); $item_container.find('.drop-icon use').attr("href", "#icon-small-up"); } - this.make_sidebar_sortable(); } initialize_editorjs(blocks) { @@ -686,6 +695,7 @@ frappe.views.Workspace = class Workspace { method: "frappe.desk.doctype.workspace.workspace.save_page", args: { title: me.title, + icon: me.icon || '', parent: me.parent || '', public: me.public || 0, sb_public_items: me.sorted_public_items, @@ -700,6 +710,7 @@ frappe.views.Workspace = class Workspace { if (res.message) { me.new_page = res.message; me.title = ''; + me.icon = ''; me.parent = ''; me.public = false; me.sorted_public_items = []; From b2b44b5939c66ffc84d16b903146c2697e6b0874 Mon Sep 17 00:00:00 2001 From: Pruthvi Patel Date: Thu, 5 Aug 2021 16:49:20 +0530 Subject: [PATCH 085/306] feat: add autoreloader for ipython --- frappe/commands/utils.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/frappe/commands/utils.py b/frappe/commands/utils.py index 8fc6877d4f..73e8002bc6 100644 --- a/frappe/commands/utils.py +++ b/frappe/commands/utils.py @@ -494,7 +494,11 @@ def console(context): frappe.connect() frappe.local.lang = frappe.db.get_default("lang") - import IPython + from IPython.terminal import embed + terminal = embed.InteractiveShellEmbed() + terminal.extension_manager.load_extension("autoreload") + terminal.run_line_magic("autoreload", "2") + all_apps = frappe.get_installed_apps() failed_to_import = [] @@ -508,8 +512,10 @@ def console(context): print("Apps in this namespace:\n{}".format(", ".join(all_apps))) if failed_to_import: print("\nFailed to import:\n{}".format(", ".join(failed_to_import))) - - IPython.embed(display_banner="", header="", colors="neutral") + + terminal.colors = "neutral" + terminal.display_banner = False + terminal() @click.command('run-tests') From 6db4b6f2e629f05f7695b81b18ea8db270b348e6 Mon Sep 17 00:00:00 2001 From: Pruthvi Patel Date: Thu, 5 Aug 2021 17:51:38 +0530 Subject: [PATCH 086/306] fix: autoreload for only developer mode --- frappe/commands/utils.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/frappe/commands/utils.py b/frappe/commands/utils.py index 73e8002bc6..765028dfed 100644 --- a/frappe/commands/utils.py +++ b/frappe/commands/utils.py @@ -494,10 +494,12 @@ def console(context): frappe.connect() frappe.local.lang = frappe.db.get_default("lang") - from IPython.terminal import embed - terminal = embed.InteractiveShellEmbed() - terminal.extension_manager.load_extension("autoreload") - terminal.run_line_magic("autoreload", "2") + from IPython.terminal.embed import InteractiveShellEmbed + + terminal = InteractiveShellEmbed() + if frappe.conf.developer_mode: + terminal.extension_manager.load_extension("autoreload") + terminal.run_line_magic("autoreload", "2") all_apps = frappe.get_installed_apps() failed_to_import = [] @@ -512,7 +514,7 @@ def console(context): print("Apps in this namespace:\n{}".format(", ".join(all_apps))) if failed_to_import: print("\nFailed to import:\n{}".format(", ".join(failed_to_import))) - + terminal.colors = "neutral" terminal.display_banner = False terminal() From bf4611e84b62c6683713152f48f955333e1de9d9 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Fri, 6 Aug 2021 14:07:22 +0530 Subject: [PATCH 087/306] fix: updated wspace json files & minor onboarding fix --- frappe/automation/workspace/tools/tools.json | 5 +++-- frappe/core/workspace/build/build.json | 5 +++-- frappe/core/workspace/settings/settings.json | 5 +++-- frappe/core/workspace/users/users.json | 5 +++-- .../workspace/customization/customization.json | 5 +++-- .../workspace/integrations/integrations.json | 5 +++-- .../js/frappe/views/workspace/blocks/onboarding.js | 13 +++++++++++++ frappe/public/js/frappe/widgets/base_widget.js | 4 ++-- .../public/js/frappe/widgets/onboarding_widget.js | 3 ++- frappe/website/workspace/website/website.json | 7 ++++--- 10 files changed, 39 insertions(+), 18 deletions(-) diff --git a/frappe/automation/workspace/tools/tools.json b/frappe/automation/workspace/tools/tools.json index eb399f6e0b..f3b9e881b0 100644 --- a/frappe/automation/workspace/tools/tools.json +++ b/frappe/automation/workspace/tools/tools.json @@ -1,7 +1,7 @@ { "category": "", "charts": [], - "content": "[{\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Your Shortcuts\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"ToDo\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Note\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"File\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Assignment Rule\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Auto Repeat\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Tools\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Email\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Automation\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Event Streaming\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}]", + "content": "[{\"type\": \"header\", \"data\": {\"text\": \"Your Shortcuts\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"ToDo\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Note\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"File\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Assignment Rule\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Auto Repeat\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Tools\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Email\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Automation\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Event Streaming\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}]", "creation": "2020-03-02 14:53:24.980279", "developer_mode_only": 0, "disable_user_customization": 0, @@ -215,7 +215,7 @@ "type": "Link" } ], - "modified": "2021-07-08 17:36:29.878969", + "modified": "2021-08-05 12:16:02.839180", "modified_by": "Administrator", "module": "Automation", "name": "Tools", @@ -226,6 +226,7 @@ "pin_to_top": 0, "public": 1, "restrict_to_domain": "", + "roles": [], "sequence_id": 26, "shortcuts": [ { diff --git a/frappe/core/workspace/build/build.json b/frappe/core/workspace/build/build.json index a911a928f5..22384369e3 100644 --- a/frappe/core/workspace/build/build.json +++ b/frappe/core/workspace/build/build.json @@ -2,7 +2,7 @@ "cards_label": "Elements", "category": "", "charts": [], - "content": "[{\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Your Shortcuts\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"DocType\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Workspace\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Report\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Elements\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Modules\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Models\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Views\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Scripting\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}]", + "content": "[{\"type\": \"header\", \"data\": {\"text\": \"Your Shortcuts\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"DocType\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Workspace\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Report\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Elements\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Modules\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Models\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Views\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Scripting\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}]", "creation": "2021-01-02 10:51:16.579957", "developer_mode_only": 0, "disable_user_customization": 0, @@ -202,7 +202,7 @@ "type": "Link" } ], - "modified": "2021-07-08 17:36:06.916752", + "modified": "2021-08-05 12:15:55.793022", "modified_by": "Administrator", "module": "Core", "name": "Build", @@ -213,6 +213,7 @@ "pin_to_top": 0, "public": 1, "restrict_to_domain": "", + "roles": [], "sequence_id": 5, "shortcuts": [ { diff --git a/frappe/core/workspace/settings/settings.json b/frappe/core/workspace/settings/settings.json index 2f6ab32070..24c19d3a95 100644 --- a/frappe/core/workspace/settings/settings.json +++ b/frappe/core/workspace/settings/settings.json @@ -1,7 +1,7 @@ { "category": "", "charts": [], - "content": "[{\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Settings\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"System Settings\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Print Settings\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Website Settings\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Data\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Email / Notifications\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Website\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Core\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Printing\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Workflow\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}]", + "content": "[{\"type\": \"header\", \"data\": {\"text\": \"Settings\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"System Settings\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Print Settings\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Website Settings\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Data\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Email / Notifications\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Website\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Core\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Printing\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Workflow\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}]", "creation": "2020-03-02 15:09:40.527211", "developer_mode_only": 0, "disable_user_customization": 0, @@ -374,7 +374,7 @@ "type": "Link" } ], - "modified": "2021-07-08 17:36:32.236600", + "modified": "2021-08-05 12:16:03.456173", "modified_by": "Administrator", "module": "Core", "name": "Settings", @@ -385,6 +385,7 @@ "pin_to_top": 0, "public": 1, "restrict_to_domain": "", + "roles": [], "sequence_id": 29, "shortcuts": [ { diff --git a/frappe/core/workspace/users/users.json b/frappe/core/workspace/users/users.json index f1994b54d9..d4086b9c23 100644 --- a/frappe/core/workspace/users/users.json +++ b/frappe/core/workspace/users/users.json @@ -1,7 +1,7 @@ { "category": "", "charts": [], - "content": "[{\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Your Shortcuts\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"User\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Role\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Permission Manager\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"User Profile\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"User Type\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Users\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Logs\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Permissions\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}]", + "content": "[{\"type\": \"header\", \"data\": {\"text\": \"Your Shortcuts\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"User\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Role\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Permission Manager\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"User Profile\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"User Type\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Users\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Logs\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Permissions\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}]", "creation": "2020-03-02 15:12:16.754449", "developer_mode_only": 0, "disable_user_customization": 0, @@ -152,7 +152,7 @@ "type": "Link" } ], - "modified": "2021-07-08 17:36:30.639286", + "modified": "2021-08-05 12:16:03.010204", "modified_by": "Administrator", "module": "Core", "name": "Users", @@ -163,6 +163,7 @@ "pin_to_top": 0, "public": 1, "restrict_to_domain": "", + "roles": [], "sequence_id": 27, "shortcuts": [ { diff --git a/frappe/custom/workspace/customization/customization.json b/frappe/custom/workspace/customization/customization.json index 6b1c0f1c78..e23de76775 100644 --- a/frappe/custom/workspace/customization/customization.json +++ b/frappe/custom/workspace/customization/customization.json @@ -1,7 +1,7 @@ { "category": "", "charts": [], - "content": "[{\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Your Shortcuts\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Customize Form\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Custom Role\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Client Script\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Server Script\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Dashboards\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Form Customization\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Other\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}]", + "content": "[{\"type\": \"header\", \"data\": {\"text\": \"Your Shortcuts\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Customize Form\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Custom Role\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Client Script\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Server Script\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Dashboards\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Form Customization\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Other\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}]", "creation": "2020-03-02 15:15:03.839594", "developer_mode_only": 0, "disable_user_customization": 0, @@ -130,7 +130,7 @@ "type": "Link" } ], - "modified": "2021-07-08 17:36:10.615028", + "modified": "2021-08-05 12:15:57.486112", "modified_by": "Administrator", "module": "Custom", "name": "Customization", @@ -141,6 +141,7 @@ "pin_to_top": 0, "public": 1, "restrict_to_domain": "", + "roles": [], "sequence_id": 8, "shortcuts": [ { diff --git a/frappe/integrations/workspace/integrations/integrations.json b/frappe/integrations/workspace/integrations/integrations.json index 3c579052ca..02540d7c5d 100644 --- a/frappe/integrations/workspace/integrations/integrations.json +++ b/frappe/integrations/workspace/integrations/integrations.json @@ -1,7 +1,7 @@ { "category": "", "charts": [], - "content": "[{\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Backup\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Google Services\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Authentication\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Payments\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Settings\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}]", + "content": "[{\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Backup\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Google Services\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Authentication\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Payments\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Settings\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}]", "creation": "2020-03-02 15:16:18.714190", "developer_mode_only": 0, "disable_user_customization": 0, @@ -267,7 +267,7 @@ "type": "Link" } ], - "modified": "2021-07-08 17:36:18.712550", + "modified": "2021-08-05 12:16:00.355267", "modified_by": "Administrator", "module": "Integrations", "name": "Integrations", @@ -278,6 +278,7 @@ "pin_to_top": 0, "public": 1, "restrict_to_domain": "", + "roles": [], "sequence_id": 15, "shortcuts": [], "title": "Integrations" diff --git a/frappe/public/js/frappe/views/workspace/blocks/onboarding.js b/frappe/public/js/frappe/views/workspace/blocks/onboarding.js index 8aaffef30b..a73f4f6b0e 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/onboarding.js +++ b/frappe/public/js/frappe/views/workspace/blocks/onboarding.js @@ -29,6 +29,18 @@ export default class Onboarding extends Block { }; } + rendered() { + var e = this.wrapper.closest('.ce-block'); + if (this.readOnly && !$(this.wrapper).find('.onboarding-widget-box').is(':visible')) { + $(e).hide(); + } + e.classList.add("col-" + this.get_col()); + e.classList.add("pt-" + this.pt); + e.classList.add("pr-" + this.pr); + e.classList.add("pb-" + this.pb); + e.classList.add("pl-" + this.pl); + } + new(block, widget_type = block) { const dialog_class = get_dialog_constructor(widget_type); let block_name = block+'_name'; @@ -103,6 +115,7 @@ export default class Onboarding extends Block { if (!this.readOnly) { this.add_tune_button(); } + $(this.wrapper).css("padding-bottom", "20px"); return this.wrapper; } diff --git a/frappe/public/js/frappe/widgets/base_widget.js b/frappe/public/js/frappe/widgets/base_widget.js index 83084e61b0..b9e60ea008 100644 --- a/frappe/public/js/frappe/widgets/base_widget.js +++ b/frappe/public/js/frappe/widgets/base_widget.js @@ -142,10 +142,10 @@ export default class Widget { this.subtitle && this.subtitle_field.html(this.subtitle); } - delete(animate=true) { + delete(animate=true, dismissed=false) { let remove_widget = (setup_new) => { this.widget.remove(); - this.options.on_delete && this.options.on_delete(this.name, setup_new); + !dismissed && this.options.on_delete && this.options.on_delete(this.name, setup_new); }; if (animate) { diff --git a/frappe/public/js/frappe/widgets/onboarding_widget.js b/frappe/public/js/frappe/widgets/onboarding_widget.js index 259bf9bc69..7237de2fb6 100644 --- a/frappe/public/js/frappe/widgets/onboarding_widget.js +++ b/frappe/public/js/frappe/widgets/onboarding_widget.js @@ -524,7 +524,8 @@ export default class OnboardingWidget extends Widget { "dismissed-onboarding", JSON.stringify(dismissed) ); - this.delete(); + this.delete(true, true); + this.widget.closest('.ce-block').hide(); }); dismiss.appendTo(this.action_area); } diff --git a/frappe/website/workspace/website/website.json b/frappe/website/workspace/website/website.json index 09af279410..13136046ca 100644 --- a/frappe/website/workspace/website/website.json +++ b/frappe/website/workspace/website/website.json @@ -1,7 +1,7 @@ { "category": "", "charts": [], - "content": "[{\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Your Shortcuts\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Blog Post\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Blogger\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Web Page\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Web Form\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Website Settings\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Setup\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Blog\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Web Site\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Portal\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Knowledge Base\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}]", + "content": "[{\"type\": \"onboarding\", \"data\": {\"onboarding_name\":\"Website\", \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Your Shortcuts\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Blog Post\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Blogger\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Web Page\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Web Form\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Website Settings\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Setup\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Blog\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Web Site\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Portal\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Knowledge Base\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}]", "creation": "2020-03-02 14:13:51.089373", "developer_mode_only": 0, "disable_user_customization": 0, @@ -239,17 +239,18 @@ "type": "Link" } ], - "modified": "2021-07-08 17:36:31.292527", + "modified": "2021-08-05 12:16:03.154032", "modified_by": "Administrator", "module": "Website", "name": "Website", - "onboarding": "", + "onboarding": "Website", "owner": "Administrator", "parent_page": "", "pin_to_bottom": 0, "pin_to_top": 0, "public": 1, "restrict_to_domain": "", + "roles": [], "sequence_id": 28, "shortcuts": [ { From 256b678d8a9e159df85cc494c5ad659e3f6de7fa Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 10 Aug 2021 10:45:21 +0530 Subject: [PATCH 088/306] fix: removed padding tune & some minor UX fixes --- .../js/frappe/views/workspace/blocks/block.js | 36 -- .../js/frappe/views/workspace/blocks/card.js | 8 - .../js/frappe/views/workspace/blocks/chart.js | 8 - .../frappe/views/workspace/blocks/header.js | 18 +- .../views/workspace/blocks/onboarding.js | 12 - .../views/workspace/blocks/paragraph.js | 12 - .../frappe/views/workspace/blocks/shortcut.js | 8 - .../frappe/views/workspace/blocks/spacer.js | 10 +- .../views/workspace/blocks/spacing_tune.js | 445 +----------------- .../js/frappe/views/workspace/workspace.js | 2 +- frappe/public/scss/desk/desktop.scss | 10 +- 11 files changed, 13 insertions(+), 556 deletions(-) diff --git a/frappe/public/js/frappe/views/workspace/blocks/block.js b/frappe/public/js/frappe/views/workspace/blocks/block.js index fd8ad9f45f..aed3c2f727 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/block.js +++ b/frappe/public/js/frappe/views/workspace/blocks/block.js @@ -31,10 +31,6 @@ export default class Block { rendered() { var e = this.wrapper.closest('.ce-block'); e.classList.add("col-" + this.get_col()); - e.classList.add("pt-" + this.pt); - e.classList.add("pr-" + this.pr); - e.classList.add("pb-" + this.pb); - e.classList.add("pl-" + this.pl); } new(block, widget_type = block) { @@ -116,36 +112,4 @@ export default class Block { } return col; } - - get_padding() { - let direction = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; - let padding = 0; - let pad_name = "p" + direction + "-0"; - let wrapper = this.wrapper.closest('.ce-block'); - let pad_left = new RegExp(/\pl-.+?\b/, "g"); - let pad_right = new RegExp(/\pr-.+?\b/, "g"); - let pad_top = new RegExp(/\pt-.+?\b/, "g"); - let pad_bottom = new RegExp(/\pb-.+?\b/, "g"); - - const get_padding = (pad_direction) => { - if (wrapper.className.match(pad_direction)) { - wrapper.classList.forEach(function (cn) { - cn.match(pad_direction) && (pad_name = cn); - }); - let parts = pad_name.split("-"); - padding = parseInt(parts[1]); - } - }; - - if ("l" == direction) { - get_padding(pad_left); - } else if ("r" == direction) { - get_padding(pad_right); - } else if ("t" == direction) { - get_padding(pad_top); - } else if ("b" == direction) { - get_padding(pad_bottom); - } - return padding; - } } \ No newline at end of file diff --git a/frappe/public/js/frappe/views/workspace/blocks/card.js b/frappe/public/js/frappe/views/workspace/blocks/card.js index 269952b504..975b32eea7 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/card.js +++ b/frappe/public/js/frappe/views/workspace/blocks/card.js @@ -15,10 +15,6 @@ export default class Card extends Block { super({ data, api, config, readOnly, block }); this.sections = {}; this.col = this.data.col ? this.data.col : "12"; - this.pt = this.data.pt ? this.data.pt : "0"; - this.pr = this.data.pr ? this.data.pr : "0"; - this.pb = this.data.pb ? this.data.pb : "0"; - this.pl = this.data.pl ? this.data.pl : "0"; this.allow_customization = !this.readOnly; this.options = { allow_sorting: this.allow_customization, @@ -57,10 +53,6 @@ export default class Card extends Block { return { card_name: blockContent.getAttribute('card_name'), col: this.get_col(), - pt: this.get_padding("t"), - pr: this.get_padding("r"), - pb: this.get_padding("b"), - pl: this.get_padding("l"), new: this.new_block_widget }; } diff --git a/frappe/public/js/frappe/views/workspace/blocks/chart.js b/frappe/public/js/frappe/views/workspace/blocks/chart.js index 30a576d0a9..e41063e6fc 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/chart.js +++ b/frappe/public/js/frappe/views/workspace/blocks/chart.js @@ -14,10 +14,6 @@ export default class Chart extends Block { constructor({ data, api, config, readOnly, block }) { super({ data, api, config, readOnly, block }); this.col = this.data.col ? this.data.col : "12"; - this.pt = this.data.pt ? this.data.pt : "0"; - this.pr = this.data.pr ? this.data.pr : "0"; - this.pb = this.data.pb ? this.data.pb : "0"; - this.pl = this.data.pl ? this.data.pl : "0"; this.allow_customization = !this.readOnly; this.options = { allow_sorting: this.allow_customization, @@ -57,10 +53,6 @@ export default class Chart extends Block { return { chart_name: blockContent.getAttribute('chart_name'), col: this.get_col(), - pt: this.get_padding("t"), - pr: this.get_padding("r"), - pb: this.get_padding("b"), - pl: this.get_padding("l"), new: this.new_block_widget }; } diff --git a/frappe/public/js/frappe/views/workspace/blocks/header.js b/frappe/public/js/frappe/views/workspace/blocks/header.js index 0f03437298..356f9c3244 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/header.js +++ b/frappe/public/js/frappe/views/workspace/blocks/header.js @@ -18,10 +18,6 @@ export default class Header extends Block { this.data = data; this.col = this.data.col ? this.data.col : "12"; - this.pt = this.data.pt ? this.data.pt : "0"; - this.pr = this.data.pr ? this.data.pr : "0"; - this.pb = this.data.pb ? this.data.pb : "0"; - this.pl = this.data.pl ? this.data.pl : "0"; } normalizeData(data) { @@ -34,10 +30,6 @@ export default class Header extends Block { newData.text = data.text || ''; newData.level = parseInt(data.level) || this.defaultLevel.number; newData.col = parseInt(data.col) || 12; - newData.pt = parseInt(data.pt) || 0; - newData.pr = parseInt(data.pr) || 0; - newData.pb = parseInt(data.pb) || 0; - newData.pl = parseInt(data.pl) || 0; return newData; } @@ -159,21 +151,13 @@ export default class Header extends Block { return { text: toolsContent.innerText, level: this.currentLevel.number, - col: this.get_col(), - pt: this.get_padding("t"), - pr: this.get_padding("r"), - pb: this.get_padding("b"), - pl: this.get_padding("l") + col: this.get_col() }; } rendered() { var e = this._element.closest('.ce-block'); e.classList.add("col-" + this.get_col()); - e.classList.add("pt-" + this.pt); - e.classList.add("pr-" + this.pr); - e.classList.add("pb-" + this.pb); - e.classList.add("pl-" + this.pl); } static get conversionConfig() { diff --git a/frappe/public/js/frappe/views/workspace/blocks/onboarding.js b/frappe/public/js/frappe/views/workspace/blocks/onboarding.js index a73f4f6b0e..7176b7726d 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/onboarding.js +++ b/frappe/public/js/frappe/views/workspace/blocks/onboarding.js @@ -15,10 +15,6 @@ export default class Onboarding extends Block { constructor({ data, api, config, readOnly, block }) { super({ data, api, config, readOnly, block }); this.col = this.data.col ? this.data.col : "12"; - this.pt = this.data.pt ? this.data.pt : "0"; - this.pr = this.data.pr ? this.data.pr : "0"; - this.pb = this.data.pb ? this.data.pb : "0"; - this.pl = this.data.pl ? this.data.pl : "0"; this.allow_customization = !this.readOnly; this.options = { allow_sorting: this.allow_customization, @@ -35,10 +31,6 @@ export default class Onboarding extends Block { $(e).hide(); } e.classList.add("col-" + this.get_col()); - e.classList.add("pt-" + this.pt); - e.classList.add("pr-" + this.pr); - e.classList.add("pb-" + this.pb); - e.classList.add("pl-" + this.pl); } new(block, widget_type = block) { @@ -131,10 +123,6 @@ export default class Onboarding extends Block { return { onboarding_name: blockContent.getAttribute('onboarding_name'), col: this.get_col(), - pt: this.get_padding("t"), - pr: this.get_padding("r"), - pb: this.get_padding("b"), - pl: this.get_padding("l"), new: this.new_block_widget }; } diff --git a/frappe/public/js/frappe/views/workspace/blocks/paragraph.js b/frappe/public/js/frappe/views/workspace/blocks/paragraph.js index 9ee6d4bd03..b594f3459a 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/paragraph.js +++ b/frappe/public/js/frappe/views/workspace/blocks/paragraph.js @@ -24,10 +24,6 @@ export default class Paragraph extends Block { this.data = data; this.col = this.data.col ? this.data.col : "12"; - this.pt = this.data.pt ? this.data.pt : "0"; - this.pr = this.data.pr ? this.data.pr : "0"; - this.pb = this.data.pb ? this.data.pb : "0"; - this.pl = this.data.pl ? this.data.pl : "0"; } onKeyUp(e) { @@ -132,20 +128,12 @@ export default class Paragraph extends Block { return { text: toolsContent.innerText, col: this.get_col(), - pt: this.get_padding("t"), - pr: this.get_padding("r"), - pb: this.get_padding("b"), - pl: this.get_padding("l") }; } rendered() { var e = this._element.closest('.ce-block'); e.classList.add("col-" + this.get_col()); - e.classList.add("pt-" + this.pt); - e.classList.add("pr-" + this.pr); - e.classList.add("pb-" + this.pb); - e.classList.add("pl-" + this.pl); } onPaste(event) { diff --git a/frappe/public/js/frappe/views/workspace/blocks/shortcut.js b/frappe/public/js/frappe/views/workspace/blocks/shortcut.js index 1701431899..0943de202d 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/shortcut.js +++ b/frappe/public/js/frappe/views/workspace/blocks/shortcut.js @@ -14,10 +14,6 @@ export default class Shortcut extends Block { constructor({ data, api, config, readOnly, block }) { super({ data, api, config, readOnly, block }); this.col = this.data.col ? this.data.col : "12"; - this.pt = this.data.pt ? this.data.pt : "0"; - this.pr = this.data.pr ? this.data.pr : "0"; - this.pb = this.data.pb ? this.data.pb : "0"; - this.pl = this.data.pl ? this.data.pl : "0"; this.allow_customization = !this.readOnly; this.options = { allow_sorting: this.allow_customization, @@ -55,10 +51,6 @@ export default class Shortcut extends Block { return { shortcut_name: blockContent.getAttribute('shortcut_name'), col: this.get_col(), - pt: this.get_padding("t"), - pr: this.get_padding("r"), - pb: this.get_padding("b"), - pl: this.get_padding("l"), new: this.new_block_widget }; } diff --git a/frappe/public/js/frappe/views/workspace/blocks/spacer.js b/frappe/public/js/frappe/views/workspace/blocks/spacer.js index 5994d49057..3309cad4a4 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/spacer.js +++ b/frappe/public/js/frappe/views/workspace/blocks/spacer.js @@ -14,10 +14,6 @@ export default class Spacer extends Block { constructor({ data, api, config, readOnly }) { super({ data, api, config, readOnly }); this.col = this.data.col ? this.data.col : "12"; - this.pt = this.data.pt ? this.data.pt : "0"; - this.pr = this.data.pr ? this.data.pr : "0"; - this.pb = this.data.pb ? this.data.pb : "0"; - this.pl = this.data.pl ? this.data.pl : "0"; } render() { @@ -80,11 +76,7 @@ export default class Spacer extends Block { save() { return { - col: this.get_col(), - pt: this.get_padding("t"), - pr: this.get_padding("r"), - pb: this.get_padding("b"), - pl: this.get_padding("l") + col: this.get_col() }; } } \ No newline at end of file diff --git a/frappe/public/js/frappe/views/workspace/blocks/spacing_tune.js b/frappe/public/js/frappe/views/workspace/blocks/spacing_tune.js index d69f39c875..8c4839d484 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/spacing_tune.js +++ b/frappe/public/js/frappe/views/workspace/blocks/spacing_tune.js @@ -12,7 +12,7 @@ export default class SpacingTune { sidebar: 'cdx-settings-sidebar', animation: 'wobble', }; - this.data = { colWidth: 12, pl: 0, pr: 0, pt: 0, pb: 0 }; + this.data = { colWidth: 12 }; this.wrapper = undefined; this.sidebar = undefined; } @@ -25,27 +25,10 @@ export default class SpacingTune { decreaseWidthButton.classList.add(this.CSS.button); let increaseWidthButton = document.createElement('div'); increaseWidthButton.classList.add(this.CSS.button); - let paddingButton = document.createElement('div'); - paddingButton.classList.add(this.CSS.button); - layoutWrapper.appendChild(paddingButton); layoutWrapper.appendChild(decreaseWidthButton); layoutWrapper.appendChild(increaseWidthButton); - // paddingButton.appendChild($.svg('padding', 15, 15)); - paddingButton.innerHTML = ``; - this.api.tooltip.onHover(paddingButton, 'Padding', { - placement: 'top', - hidingDelay: 500, - }); - this.api.listeners.on( - paddingButton, - 'click', - () => me.showPadding(paddingButton), - false - ); - - // decreaseWidthButton.appendChild($.svg('decrease-width', 15, 15)); decreaseWidthButton.innerHTML = ``; this.api.tooltip.onHover(decreaseWidthButton, 'Shrink', { placement: 'top', @@ -58,7 +41,6 @@ export default class SpacingTune { false ); - // increaseWidthButton.appendChild(); increaseWidthButton.innerHTML = ``; this.api.tooltip.onHover(increaseWidthButton, 'Expand', { placement: 'top', @@ -89,7 +71,6 @@ export default class SpacingTune { let currentBlockElement = currentBlock.holder; - // let block = this.api.blocks.getBlock(currentBlockElement); let className = 'col-12'; let colClass = new RegExp(/\bcol-.+?\b/, 'g'); if (currentBlockElement.className.match(colClass)) { @@ -122,7 +103,6 @@ export default class SpacingTune { const currentBlockElement = currentBlock.holder; - // let block = this.api.blocks.getBlock(currentBlockElement); let className = 'col-12'; const colClass = new RegExp(/\bcol-.+?\b/, 'g'); if (currentBlockElement.className.match(colClass)) { @@ -140,427 +120,4 @@ export default class SpacingTune { } } } - - showPadding(button) { - let me = this; - if (button.classList.contains('cdx-settings-button--active')) { - this.sidebar.remove(); - button.classList.remove('cdx-settings-button--active'); - } else { - button.classList.add('cdx-settings-button--active'); - - let sidebarWrapper = document.createElement('div'); - sidebarWrapper.classList.add(this.CSS.sidebar); - - let paddingLeftCaption = document.createElement('button'); - paddingLeftCaption.classList.add(this.CSS.button, 'disabled'); - // paddingLeftCaption.appendChild($.svg('arrow-left', 10, 10)); - paddingLeftCaption.innerHTML = ``; - - let paddingRightCaption = document.createElement('button'); - paddingRightCaption.classList.add(this.CSS.button, 'disabled'); - // paddingRightCaption.appendChild($.svg('arrow-right', 10, 10)); - paddingRightCaption.innerHTML = ``; - - let paddingTopCaption = document.createElement('button'); - paddingTopCaption.classList.add(this.CSS.button, 'disabled'); - // paddingTopCaption.appendChild($.svg('arrow-up', 10, 10)); - paddingTopCaption.innerHTML = ``; - - let paddingBottomCaption = document.createElement('button'); - paddingBottomCaption.classList.add(this.CSS.button, 'disabled'); - // paddingBottomCaption.appendChild($.svg('arrow-down', 10, 10)); - paddingBottomCaption.innerHTML = ``; - - let increasePaddingLeft = document.createElement('button'); - increasePaddingLeft.classList.add(this.CSS.button); - - let decreasePaddingLeft = document.createElement('button'); - decreasePaddingLeft.classList.add(this.CSS.button); - - let increasePaddingRight = document.createElement('button'); - increasePaddingRight.classList.add(this.CSS.button); - - let decreasePaddingRight = document.createElement('button'); - decreasePaddingRight.classList.add(this.CSS.button); - - let increasePaddingTop = document.createElement('button'); - increasePaddingTop.classList.add(this.CSS.button); - - let decreasePaddingTop = document.createElement('button'); - decreasePaddingTop.classList.add(this.CSS.button); - - let increasePaddingBottom = document.createElement('button'); - increasePaddingBottom.classList.add(this.CSS.button); - - let decreasePaddingBottom = document.createElement('button'); - decreasePaddingBottom.classList.add(this.CSS.button); - - this.sidebar = sidebarWrapper; - - // Left Padding - sidebarWrapper.appendChild(paddingLeftCaption); - - // increasePaddingLeft.appendChild($.svg('plus', 15, 15)); - increasePaddingLeft.innerHTML = ``; - - this.api.listeners.on( - increasePaddingLeft, - 'click', - () => me.increasePaddingLeft(), - false - ); - sidebarWrapper.appendChild(increasePaddingLeft); - - // decreasePaddingLeft.appendChild($.svg('minus', 15, 15)); - decreasePaddingLeft.innerHTML = ``; - - this.api.listeners.on( - decreasePaddingLeft, - 'click', - () => me.decreasePaddingLeft(), - false - ); - sidebarWrapper.appendChild(decreasePaddingLeft); - - // Right Padding - sidebarWrapper.appendChild(paddingRightCaption); - // increasePaddingRight.appendChild($.svg('plus', 15, 15)); - increasePaddingRight.innerHTML = ``; - - this.api.listeners.on( - increasePaddingRight, - 'click', - () => me.increasePaddingRight(), - false - ); - sidebarWrapper.appendChild(increasePaddingRight); - - // decreasePaddingRight.appendChild($.svg('minus', 15, 15)); - decreasePaddingRight.innerHTML = ``; - - this.api.listeners.on( - decreasePaddingRight, - 'click', - () => me.decreasePaddingRight(), - false - ); - sidebarWrapper.appendChild(decreasePaddingRight); - - // Top Padding - sidebarWrapper.appendChild(paddingTopCaption); - // increasePaddingTop.appendChild($.svg('plus', 15, 15)); - increasePaddingTop.innerHTML = ``; - - this.api.listeners.on( - increasePaddingTop, - 'click', - () => me.increasePaddingTop(), - false - ); - sidebarWrapper.appendChild(increasePaddingTop); - - // decreasePaddingTop.appendChild($.svg('minus', 15, 15)); - decreasePaddingTop.innerHTML = ``; - - this.api.listeners.on( - decreasePaddingTop, - 'click', - () => me.decreasePaddingTop(), - false - ); - sidebarWrapper.appendChild(decreasePaddingTop); - - // Bottom Padding - sidebarWrapper.appendChild(paddingBottomCaption); - // increasePaddingBottom.appendChild($.svg('plus', 15, 15)); - increasePaddingBottom.innerHTML = ``; - - this.api.listeners.on( - increasePaddingBottom, - 'click', - () => me.increasePaddingBottom(), - false - ); - sidebarWrapper.appendChild(increasePaddingBottom); - - // decreasePaddingBottom.appendChild($.svg('minus', 15, 15)); - decreasePaddingBottom.innerHTML = ``; - - this.api.listeners.on( - decreasePaddingBottom, - 'click', - () => me.decreasePaddingBottom(), - false - ); - sidebarWrapper.appendChild(decreasePaddingBottom); - - this.wrapper.appendChild(sidebarWrapper); - } - } - - increasePaddingLeft() { - const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); - - if (currentBlockIndex < 0) { - return; - } - - const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); - if (!currentBlock) { - return; - } - - const currentBlockElement = currentBlock.holder; - - // let block = this.api.blocks.getBlock(currentBlockElement); - let className = 'pl-0'; - const paddingClass = new RegExp(/\pl-.+?\b/, 'g'); - if (currentBlockElement.className.match(paddingClass)) { - currentBlockElement.classList.forEach( cn => { - if (cn.match(paddingClass)) { - className = cn; - } - }); - let parts = className.split('-'); - let padding = parseInt(parts[1]); - if (padding <= 4) { - currentBlockElement.classList.remove('pl-'+padding); - padding = padding + 1; - currentBlockElement.classList.add('pl-'+padding); - } - } - - } - - decreasePaddingLeft() { - const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); - - if (currentBlockIndex < 0) { - return; - } - - const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); - if (!currentBlock) { - return; - } - - const currentBlockElement = currentBlock.holder; - - // let block = this.api.blocks.getBlock(currentBlockElement); - let className = 'pl-0'; - const paddingClass = new RegExp(/\pl-.+?\b/, 'g'); - if (currentBlockElement.className.match(paddingClass)) { - currentBlockElement.classList.forEach( cn => { - if (cn.match(paddingClass)) { - className = cn; - } - }); - let parts = className.split('-'); - let padding = parseInt(parts[1]); - if (padding >= 1) { - currentBlockElement.classList.remove('pl-'+padding); - padding = padding - 1; - currentBlockElement.classList.add('pl-'+padding); - } - } - } - - increasePaddingRight() { - const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); - - if (currentBlockIndex < 0) { - return; - } - - const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); - if (!currentBlock) { - return; - } - - const currentBlockElement = currentBlock.holder; - - // let block = this.api.blocks.getBlock(currentBlockElement); - let className = 'pr-0'; - const paddingClass = new RegExp(/\pr-.+?\b/, 'g'); - if (currentBlockElement.className.match(paddingClass)) { - currentBlockElement.classList.forEach( cn => { - if (cn.match(paddingClass)) { - className = cn; - } - }); - let parts = className.split('-'); - let padding = parseInt(parts[1]); - if (padding <= 4) { - currentBlockElement.classList.remove('pr-'+padding); - padding = padding + 1; - currentBlockElement.classList.add('pr-'+padding); - } - } - } - - decreasePaddingRight() { - const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); - - if (currentBlockIndex < 0) { - return; - } - - const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); - if (!currentBlock) { - return; - } - - const currentBlockElement = currentBlock.holder; - - // let block = this.api.blocks.getBlock(currentBlockElement); - let className = 'pr-0'; - const paddingClass = new RegExp(/\pr-.+?\b/, 'g'); - if (currentBlockElement.className.match(paddingClass)) { - currentBlockElement.classList.forEach( cn => { - if (cn.match(paddingClass)) { - className = cn; - } - }); - let parts = className.split('-'); - let padding = parseInt(parts[1]); - if (padding >= 1) { - currentBlockElement.classList.remove('pr-'+padding); - padding = padding - 1; - currentBlockElement.classList.add('pr-'+padding); - } - } - } - - increasePaddingTop() { - const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); - - if (currentBlockIndex < 0) { - return; - } - - const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); - if (!currentBlock) { - return; - } - - const currentBlockElement = currentBlock.holder; - - // let block = this.api.blocks.getBlock(currentBlockElement); - let className = 'pt-0'; - const paddingClass = new RegExp(/\pt-.+?\b/, 'g'); - if (currentBlockElement.className.match(paddingClass)) { - currentBlockElement.classList.forEach( cn => { - if (cn.match(paddingClass)) { - className = cn; - } - }); - let parts = className.split('-'); - let padding = parseInt(parts[1]); - if (padding <= 4) { - currentBlockElement.classList.remove('pt-'+padding); - padding = padding + 1; - currentBlockElement.classList.add('pt-'+padding); - } - } - } - - decreasePaddingTop() { - const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); - - if (currentBlockIndex < 0) { - return; - } - - const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); - if (!currentBlock) { - return; - } - - const currentBlockElement = currentBlock.holder; - - // let block = this.api.blocks.getBlock(currentBlockElement); - let className = 'pt-0'; - const paddingClass = new RegExp(/\pt-.+?\b/, 'g'); - if (currentBlockElement.className.match(paddingClass)) { - currentBlockElement.classList.forEach( cn => { - if (cn.match(paddingClass)) { - className = cn; - } - }); - let parts = className.split('-'); - let padding = parseInt(parts[1]); - if (padding >= 1) { - currentBlockElement.classList.remove('pt-'+padding); - padding = padding - 1; - currentBlockElement.classList.add('pt-'+padding); - } - } - } - - increasePaddingBottom() { - const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); - - if (currentBlockIndex < 0) { - return; - } - - const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); - if (!currentBlock) { - return; - } - - const currentBlockElement = currentBlock.holder; - - // let block = this.api.blocks.getBlock(currentBlockElement); - let className = 'pb-0'; - const paddingClass = new RegExp(/\pb-.+?\b/, 'g'); - if (currentBlockElement.className.match(paddingClass)) { - currentBlockElement.classList.forEach( cn => { - if (cn.match(paddingClass)) { - className = cn; - } - }); - let parts = className.split('-'); - let padding = parseInt(parts[1]); - if (padding <= 4) { - currentBlockElement.classList.remove('pb-'+padding); - padding = padding + 1; - currentBlockElement.classList.add('pb-'+padding); - } - } - } - - decreasePaddingBottom() { - const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); - - if (currentBlockIndex < 0) { - return; - } - - const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); - if (!currentBlock) { - return; - } - - const currentBlockElement = currentBlock.holder; - - // let block = this.api.blocks.getBlock(currentBlockElement); - let className = 'pb-0'; - const paddingClass = new RegExp(/\pb-.+?\b/, 'g'); - if (currentBlockElement.className.match(paddingClass)) { - currentBlockElement.classList.forEach( cn => { - if (cn.match(paddingClass)) { - className = cn; - } - }); - let parts = className.split('-'); - let padding = parseInt(parts[1]); - if (padding >= 1) { - currentBlockElement.classList.remove('pb-'+padding); - padding = padding - 1; - currentBlockElement.classList.add('pb-'+padding); - } - } - } } \ No newline at end of file diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index e315704e3d..43639c2f4a 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -418,7 +418,7 @@ frappe.views.Workspace = class Workspace { me.editor.blocks.insert(key, {}, {}, index, true); me.editor.caret.setToLastBlock('start', 0); $('.ce-block:last-child')[0].scrollIntoView(); - }, `${frappe.utils.icon('small-add', 'xs')} ${__('Add Block')}`); + }, __('Add Block')); }); } diff --git a/frappe/public/scss/desk/desktop.scss b/frappe/public/scss/desk/desktop.scss index 88dd7e14c2..0db526978f 100644 --- a/frappe/public/scss/desk/desktop.scss +++ b/frappe/public/scss/desk/desktop.scss @@ -983,7 +983,15 @@ body { .ce-settings { width: fit-content; - + + .ce-settings__button, .cdx-settings-button { + color: #707684; + } + + .cdx-settings-button--active { + color: #388ae5; + } + .cdx-settings-button.disabled{ pointer-events: none; opacity: .5 From ed99915a7909e0cb53d910409531fbc13a9a1ce7 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 10 Aug 2021 11:20:23 +0530 Subject: [PATCH 089/306] refactor: Refactored code --- frappe/public/js/frappe/form/controls/base_control.js | 6 +----- frappe/public/js/frappe/form/controls/datetime.js | 3 ++- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/frappe/public/js/frappe/form/controls/base_control.js b/frappe/public/js/frappe/form/controls/base_control.js index 7977458ad7..d6c268a28a 100644 --- a/frappe/public/js/frappe/form/controls/base_control.js +++ b/frappe/public/js/frappe/form/controls/base_control.js @@ -160,11 +160,7 @@ frappe.ui.form.Control = class BaseControl { validate_and_set_in_model(value, e) { var me = this; let force_value_set = (this.doc && this.doc.__run_link_triggers); - let model_value = this.get_model_value(); - - model_value = this.parse_model_value && this.parse_model_value(model_value); - - let is_value_same = (model_value === value); + let is_value_same = (this.get_model_value() === value); if (this.inside_change_event || (!force_value_set && is_value_same)) { return Promise.resolve(); diff --git a/frappe/public/js/frappe/form/controls/datetime.js b/frappe/public/js/frappe/form/controls/datetime.js index 7a3cef2304..3fb00a6f26 100644 --- a/frappe/public/js/frappe/form/controls/datetime.js +++ b/frappe/public/js/frappe/form/controls/datetime.js @@ -37,7 +37,8 @@ frappe.ui.form.ControlDatetime = class ControlDatetime extends frappe.ui.form.Co } } - parse_model_value(value) { + get_model_value() { + let value = super.get_model_value() return frappe.datetime.get_datetime_as_string(value); } }; From 9da6fcadc8b1062afd14d4c6943a8f1a2d07e7eb Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 10 Aug 2021 11:31:16 +0530 Subject: [PATCH 090/306] fix: sider fix --- frappe/public/js/frappe/form/controls/datetime.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/controls/datetime.js b/frappe/public/js/frappe/form/controls/datetime.js index 3fb00a6f26..f7a2798a99 100644 --- a/frappe/public/js/frappe/form/controls/datetime.js +++ b/frappe/public/js/frappe/form/controls/datetime.js @@ -38,7 +38,7 @@ frappe.ui.form.ControlDatetime = class ControlDatetime extends frappe.ui.form.Co } get_model_value() { - let value = super.get_model_value() + let value = super.get_model_value(); return frappe.datetime.get_datetime_as_string(value); } }; From 5bed8031a2c233d859ff0ea4df6df6842254cf36 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 10 Aug 2021 17:52:42 +0530 Subject: [PATCH 091/306] fix: removed padding code from wspace json files & patch --- frappe/automation/workspace/tools/tools.json | 2 +- frappe/core/workspace/build/build.json | 2 +- frappe/core/workspace/settings/settings.json | 2 +- frappe/core/workspace/users/users.json | 2 +- .../workspace/customization/customization.json | 2 +- .../workspace/integrations/integrations.json | 2 +- frappe/patches/v13_0/update_workspace2.py | 16 ++++++++-------- .../views/workspace/blocks/spacing_tune.js | 4 ++-- frappe/website/workspace/website/website.json | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/frappe/automation/workspace/tools/tools.json b/frappe/automation/workspace/tools/tools.json index f3b9e881b0..f556be1c07 100644 --- a/frappe/automation/workspace/tools/tools.json +++ b/frappe/automation/workspace/tools/tools.json @@ -1,7 +1,7 @@ { "category": "", "charts": [], - "content": "[{\"type\": \"header\", \"data\": {\"text\": \"Your Shortcuts\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"ToDo\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Note\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"File\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Assignment Rule\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Auto Repeat\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Tools\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Email\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Automation\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Event Streaming\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}]", + "content": "[{\"type\": \"header\", \"data\": {\"text\": \"Your Shortcuts\", \"level\": 4, \"col\": 12}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"ToDo\", \"col\": 4}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Note\", \"col\": 4}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"File\", \"col\": 4}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Assignment Rule\", \"col\": 4}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Auto Repeat\", \"col\": 4}}, {\"type\": \"spacer\", \"data\": {\"col\": 12}}, {\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Tools\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Email\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Automation\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Event Streaming\", \"col\": 4}}]", "creation": "2020-03-02 14:53:24.980279", "developer_mode_only": 0, "disable_user_customization": 0, diff --git a/frappe/core/workspace/build/build.json b/frappe/core/workspace/build/build.json index 22384369e3..464052ba39 100644 --- a/frappe/core/workspace/build/build.json +++ b/frappe/core/workspace/build/build.json @@ -2,7 +2,7 @@ "cards_label": "Elements", "category": "", "charts": [], - "content": "[{\"type\": \"header\", \"data\": {\"text\": \"Your Shortcuts\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"DocType\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Workspace\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Report\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Elements\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Modules\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Models\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Views\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Scripting\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}]", + "content": "[{\"type\": \"header\", \"data\": {\"text\": \"Your Shortcuts\", \"level\": 4, \"col\": 12}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"DocType\", \"col\": 4}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Workspace\", \"col\": 4}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Report\", \"col\": 4}}, {\"type\": \"spacer\", \"data\": {\"col\": 12}}, {\"type\": \"header\", \"data\": {\"text\": \"Elements\", \"level\": 4, \"col\": 12}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Modules\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Models\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Views\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Scripting\", \"col\": 4}}]", "creation": "2021-01-02 10:51:16.579957", "developer_mode_only": 0, "disable_user_customization": 0, diff --git a/frappe/core/workspace/settings/settings.json b/frappe/core/workspace/settings/settings.json index 24c19d3a95..93a6c81c90 100644 --- a/frappe/core/workspace/settings/settings.json +++ b/frappe/core/workspace/settings/settings.json @@ -1,7 +1,7 @@ { "category": "", "charts": [], - "content": "[{\"type\": \"header\", \"data\": {\"text\": \"Settings\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"System Settings\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Print Settings\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Website Settings\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Data\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Email / Notifications\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Website\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Core\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Printing\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Workflow\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}]", + "content": "[{\"type\": \"header\", \"data\": {\"text\": \"Settings\", \"level\": 4, \"col\": 12}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"System Settings\", \"col\": 4}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Print Settings\", \"col\": 4}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Website Settings\", \"col\": 4}}, {\"type\": \"spacer\", \"data\": {\"col\": 12}}, {\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Data\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Email / Notifications\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Website\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Core\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Printing\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Workflow\", \"col\": 4}}]", "creation": "2020-03-02 15:09:40.527211", "developer_mode_only": 0, "disable_user_customization": 0, diff --git a/frappe/core/workspace/users/users.json b/frappe/core/workspace/users/users.json index d4086b9c23..09a835ea2c 100644 --- a/frappe/core/workspace/users/users.json +++ b/frappe/core/workspace/users/users.json @@ -1,7 +1,7 @@ { "category": "", "charts": [], - "content": "[{\"type\": \"header\", \"data\": {\"text\": \"Your Shortcuts\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"User\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Role\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Permission Manager\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"User Profile\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"User Type\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Users\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Logs\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Permissions\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}]", + "content": "[{\"type\": \"header\", \"data\": {\"text\": \"Your Shortcuts\", \"level\": 4, \"col\": 12}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"User\", \"col\": 4}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Role\", \"col\": 4}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Permission Manager\", \"col\": 4}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"User Profile\", \"col\": 4}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"User Type\", \"col\": 4}}, {\"type\": \"spacer\", \"data\": {\"col\": 12}}, {\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Users\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Logs\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Permissions\", \"col\": 4}}]", "creation": "2020-03-02 15:12:16.754449", "developer_mode_only": 0, "disable_user_customization": 0, diff --git a/frappe/custom/workspace/customization/customization.json b/frappe/custom/workspace/customization/customization.json index e23de76775..136b1a57eb 100644 --- a/frappe/custom/workspace/customization/customization.json +++ b/frappe/custom/workspace/customization/customization.json @@ -1,7 +1,7 @@ { "category": "", "charts": [], - "content": "[{\"type\": \"header\", \"data\": {\"text\": \"Your Shortcuts\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Customize Form\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Custom Role\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Client Script\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Server Script\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Dashboards\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Form Customization\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Other\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}]", + "content": "[{\"type\": \"header\", \"data\": {\"text\": \"Your Shortcuts\", \"level\": 4, \"col\": 12}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Customize Form\", \"col\": 4}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Custom Role\", \"col\": 4}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Client Script\", \"col\": 4}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Server Script\", \"col\": 4}}, {\"type\": \"spacer\", \"data\": {\"col\": 12}}, {\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Dashboards\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Form Customization\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Other\", \"col\": 4}}]", "creation": "2020-03-02 15:15:03.839594", "developer_mode_only": 0, "disable_user_customization": 0, diff --git a/frappe/integrations/workspace/integrations/integrations.json b/frappe/integrations/workspace/integrations/integrations.json index 02540d7c5d..4167858db2 100644 --- a/frappe/integrations/workspace/integrations/integrations.json +++ b/frappe/integrations/workspace/integrations/integrations.json @@ -1,7 +1,7 @@ { "category": "", "charts": [], - "content": "[{\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Backup\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Google Services\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Authentication\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Payments\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Settings\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}]", + "content": "[{\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Backup\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Google Services\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Authentication\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Payments\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Settings\", \"col\": 4}}]", "creation": "2020-03-02 15:16:18.714190", "developer_mode_only": 0, "disable_user_customization": 0, diff --git a/frappe/patches/v13_0/update_workspace2.py b/frappe/patches/v13_0/update_workspace2.py index f5f54fc7ee..2d7eb4cc76 100644 --- a/frappe/patches/v13_0/update_workspace2.py +++ b/frappe/patches/v13_0/update_workspace2.py @@ -14,35 +14,35 @@ def execute(): def create_content(doc): content = [] if doc.onboarding: - content.append({"type":"onboarding","data":{"onboarding_name":doc.onboarding,"col":12,"pt":0,"pr":0,"pb":0,"pl":0}}) + content.append({"type":"onboarding","data":{"onboarding_name":doc.onboarding,"col":12}}) if doc.charts: invalid_links = [] for c in doc.charts: if c.get_invalid_links()[0]: invalid_links.append(c) else: - content.append({"type":"chart","data":{"chart_name":c.label,"col":12,"pt":0,"pr":0,"pb":0,"pl":0}}) + content.append({"type":"chart","data":{"chart_name":c.label,"col":12}}) for l in invalid_links: del doc.charts[doc.charts.index(l)] if doc.shortcuts: invalid_links = [] if doc.charts: - content.append({"type":"spacer","data":{"col":12,"pt":0,"pr":0,"pb":0,"pl":0}}) - content.append({"type":"header","data":{"text":doc.shortcuts_label or _("Your Shortcuts"),"level":4,"col":12,"pt":0,"pr":0,"pb":0,"pl":0}}) + content.append({"type":"spacer","data":{"col":12}}) + content.append({"type":"header","data":{"text":doc.shortcuts_label or _("Your Shortcuts"),"level":4,"col":12}}) for s in doc.shortcuts: if s.get_invalid_links()[0]: invalid_links.append(s) else: - content.append({"type":"shortcut","data":{"shortcut_name":s.label,"col":4,"pt":0,"pr":0,"pb":0,"pl":0}}) + content.append({"type":"shortcut","data":{"shortcut_name":s.label,"col":4}}) for l in invalid_links: del doc.shortcuts[doc.shortcuts.index(l)] if doc.links: invalid_links = [] - content.append({"type":"spacer","data":{"col":12,"pt":0,"pr":0,"pb":0,"pl":0}}) - content.append({"type":"header","data":{"text":doc.cards_label or _("Reports & Masters"),"level":4,"col":12,"pt":0,"pr":0,"pb":0,"pl":0}}) + content.append({"type":"spacer","data":{"col":12}}) + content.append({"type":"header","data":{"text":doc.cards_label or _("Reports & Masters"),"level":4,"col":12}}) for l in doc.links: if l.type == 'Card Break': - content.append({"type":"card","data":{"card_name":l.label,"col":4,"pt":0,"pr":0,"pb":0,"pl":0}}) + content.append({"type":"card","data":{"card_name":l.label,"col":4}}) if l.get_invalid_links()[0]: invalid_links.append(l) for l in invalid_links: diff --git a/frappe/public/js/frappe/views/workspace/blocks/spacing_tune.js b/frappe/public/js/frappe/views/workspace/blocks/spacing_tune.js index 8c4839d484..365f7f590e 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/spacing_tune.js +++ b/frappe/public/js/frappe/views/workspace/blocks/spacing_tune.js @@ -22,9 +22,9 @@ export default class SpacingTune { let layoutWrapper = document.createElement('div'); layoutWrapper.classList.add(this.CSS.wrapper); let decreaseWidthButton = document.createElement('div'); - decreaseWidthButton.classList.add(this.CSS.button); + decreaseWidthButton.classList.add(this.CSS.button, 'ce-shrink-button'); let increaseWidthButton = document.createElement('div'); - increaseWidthButton.classList.add(this.CSS.button); + increaseWidthButton.classList.add(this.CSS.button, 'ce-expand-button'); layoutWrapper.appendChild(decreaseWidthButton); layoutWrapper.appendChild(increaseWidthButton); diff --git a/frappe/website/workspace/website/website.json b/frappe/website/workspace/website/website.json index 13136046ca..8d22f84b5e 100644 --- a/frappe/website/workspace/website/website.json +++ b/frappe/website/workspace/website/website.json @@ -1,7 +1,7 @@ { "category": "", "charts": [], - "content": "[{\"type\": \"onboarding\", \"data\": {\"onboarding_name\":\"Website\", \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Your Shortcuts\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Blog Post\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Blogger\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Web Page\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Web Form\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Website Settings\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Setup\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Blog\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Web Site\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Portal\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Knowledge Base\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}]", + "content": "[{\"type\": \"onboarding\", \"data\": {\"onboarding_name\":\"Website\", \"col\": 12}}, {\"type\": \"header\", \"data\": {\"text\": \"Your Shortcuts\", \"level\": 4, \"col\": 12}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Blog Post\", \"col\": 4}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Blogger\", \"col\": 4}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Web Page\", \"col\": 4}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Web Form\", \"col\": 4}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Website Settings\", \"col\": 4}}, {\"type\": \"spacer\", \"data\": {\"col\": 12}}, {\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Setup\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Blog\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Web Site\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Portal\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Knowledge Base\", \"col\": 4}}]", "creation": "2020-03-02 14:13:51.089373", "developer_mode_only": 0, "disable_user_customization": 0, From e5da8b3359bb05a351501ce53a84c2f6dab6824f Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 10 Aug 2021 18:20:38 +0530 Subject: [PATCH 092/306] test: UI test for Workspace 2.0 --- cypress/integration/workspace.js | 86 +++++++++++++++++++ .../js/frappe/views/workspace/workspace.js | 1 + 2 files changed, 87 insertions(+) create mode 100644 cypress/integration/workspace.js diff --git a/cypress/integration/workspace.js b/cypress/integration/workspace.js new file mode 100644 index 0000000000..b1e9fd759a --- /dev/null +++ b/cypress/integration/workspace.js @@ -0,0 +1,86 @@ +context('Workspace 2.0', () => { + before(() => { + cy.login(); + cy.visit('/app/website'); + }); + + it('Navigate to page from sidebar', () => { + cy.get('.codex-editor__redactor .ce-block'); + cy.get('.sidebar-item-container[item-name="Settings"]').first().click(); + cy.location('pathname').should('eq', '/app/settings'); + }); + + it('Create Private Page', () => { + cy.get('.codex-editor__redactor .ce-block'); + cy.get('.custom-actions button[data-label="Create%20Page"]').click(); + cy.fill_field('title', 'Test Private Page', 'Data'); + cy.fill_field('icon', 'edit', 'Icon'); + cy.get_open_dialog().find('.modal-header').click(); + cy.get_open_dialog().find('.btn-primary').click(); + + // check if sidebar item is added in pubic section + cy.get('.sidebar-item-container[item-name="Test Private Page"]').should('have.attr', 'item-public', '0'); + + cy.get('.standard-actions .btn-primary[data-label="Save Customizations"]').click(); + cy.wait(300); + cy.get('.sidebar-item-container[item-name="Test Private Page"]').should('have.attr', 'item-public', '0'); + }); + + it('Add New Block', () => { + cy.get('.codex-editor__redactor .ce-block'); + cy.get('.standard-actions .btn-secondary[data-label=Customize]').click(); + + cy.get('.custom-actions .inner-group-button[data-label="Add%20Block"]').click(); + cy.get('.custom-actions .inner-group-button .dropdown-menu .block-menu-item-label').contains('Heading').click(); + cy.get(".ce-block:last").type('Header'); + cy.get(".ce-block:last").find('.ce-header').should('exist'); + + cy.get('.custom-actions .inner-group-button[data-label="Add%20Block"]').click(); + cy.get('.custom-actions .inner-group-button .dropdown-menu .block-menu-item-label').contains('Text').click(); + cy.get(".ce-block:last").type('Paragraph text'); + cy.get(".ce-block:last").find('.ce-paragraph').should('exist'); + }); + + it('Delete A Block', () => { + cy.get(".ce-block:last").find('.delete-paragraph').click(); + cy.get(".ce-block:last").find('.ce-paragraph').should('not.exist'); + }); + + it('Shrink and Expand A Block', () => { + cy.get(".ce-block:last").find('.tune-btn').click(); + cy.get('.ce-settings--opened .ce-shrink-button').click(); + cy.get(".ce-block:last").should('have.class', 'col-11'); + cy.get('.ce-settings--opened .ce-shrink-button').click(); + cy.get(".ce-block:last").should('have.class', 'col-10'); + cy.get('.ce-settings--opened .ce-shrink-button').click(); + cy.get(".ce-block:last").should('have.class', 'col-9'); + cy.get('.ce-settings--opened .ce-expand-button').click(); + cy.get(".ce-block:last").should('have.class', 'col-10'); + cy.get('.ce-settings--opened .ce-expand-button').click(); + cy.get(".ce-block:last").should('have.class', 'col-11'); + cy.get('.ce-settings--opened .ce-expand-button').click(); + cy.get(".ce-block:last").should('have.class', 'col-12'); + }); + + it('Change Header Text Size', () => { + cy.get('.ce-settings--opened .cdx-settings-button[data-level="3"]').click(); + cy.get(".ce-block:last").find('.widget-head h3').should('exist'); + cy.get('.ce-settings--opened .cdx-settings-button[data-level="4"]').click(); + cy.get(".ce-block:last").find('.widget-head h4').should('exist'); + + cy.get('.standard-actions .btn-primary[data-label="Save Customizations"]').click(); + }); + + it('Delete Private Page', () => { + cy.get('.codex-editor__redactor .ce-block'); + cy.get('.standard-actions .btn-secondary[data-label=Customize]').click(); + + cy.get('.sidebar-item-container[item-name="Test Private Page"]').find('.sidebar-item-control .delete-page').click(); + cy.wait(300); + cy.get('.modal-footer > .standard-actions > .btn-modal-primary:visible').first().click(); + cy.get('.standard-actions .btn-primary[data-label="Save Customizations"]').click(); + cy.get('.codex-editor__redactor .ce-block'); + cy.get('.sidebar-item-container[item-name="Test Private Page"]').should('not.exist'); + }); + +}); \ No newline at end of file diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index 43639c2f4a..4cbede34e6 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -386,6 +386,7 @@ frappe.views.Workspace = class Workspace { () => { this.page.clear_primary_action(); this.page.clear_secondary_action(); + this.page.clear_inner_toolbar(); this.undo.readOnly = true; this.save_page(); this.editor.readOnly.toggle(); From 3fbacb97f42e06da35ea8747e360566f3a73c388 Mon Sep 17 00:00:00 2001 From: Komal-Saraf0609 Date: Tue, 10 Aug 2021 18:53:20 +0530 Subject: [PATCH 093/306] test: Added test cases for folder navigation and checking if the nested folder contains the added file --- cypress/integration/folder_navigation.js | 79 ++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 cypress/integration/folder_navigation.js diff --git a/cypress/integration/folder_navigation.js b/cypress/integration/folder_navigation.js new file mode 100644 index 0000000000..4a389101b5 --- /dev/null +++ b/cypress/integration/folder_navigation.js @@ -0,0 +1,79 @@ +context('Folder Navigation', () => { + before(() => { + cy.visit('/login'); + cy.login(); + cy.visit('/app/file'); + }); + + it('Adding Folders', () => { + //Adding filter to go into the home folder + cy.get('.filter-selector > .btn').click(); + cy.get('.filter-action-buttons > div > .btn-secondary').contains('Clear Filters').click(); + cy.get('.filter-action-buttons > .text-muted').click(); + cy.get('.fieldname-select-area > .awesomplete > .form-control').type('Fol{enter}'); + cy.get('.filter-field > .form-group > .link-field > .awesomplete > .input-with-feedback').type('Home{enter}'); + cy.get('.filter-action-buttons > div > .btn-primary').click(); + + //Adding folder (Test Folder) + cy.get('.menu-btn-group > .btn').click(); + cy.get('.menu-btn-group > .dropdown-menu > .user-action > .grey-link').eq(2).click(); + cy.get('form > .frappe-control > .form-group > .control-input-wrapper > .control-input > .input-with-feedback').type('Test Folder'); + cy.get('.modal-footer > .standard-actions > .btn-primary').click(); + }); + + it('Navigating the nested folders, checking if the URL formed is correct, checking if the added content in the child folder is correct', () => { + //Navigating inside the Attachments folder + cy.get('[title="Attachments"] > span').click(); + + //To check if the URL formed after visiting the attachments folder is correct + cy.location('pathname').should('eq', '/app/file/view/home/Attachments'); + cy.visit('/app/file/view/home/Attachments'); + + //Adding folder inside the attachments folder + cy.get('.menu-btn-group > .btn').click(); + cy.get('.menu-btn-group > .dropdown-menu > .user-action > .grey-link').eq(2).click(); + cy.get('form > .frappe-control > .form-group > .control-input-wrapper > .control-input > .input-with-feedback').type('Test Folder'); + cy.get('.modal-footer > .standard-actions > .btn-primary').click(); + + //Navigating inside the added folder in the Attachments folder + cy.get('[title="Test Folder"] > span').click(); + + //To check if the URL is correct after visiting the Test Folder + cy.location('pathname').should('eq', '/app/file/view/home/Attachments/Test%20Folder'); + cy.visit('/app/file/view/home/Attachments/Test%20Folder'); + + //Adding a file inside the Test Folder + cy.get('.primary-action').contains('Add File').eq(0).click({force : true}); + cy.get('.mt-2 > .btn > .mt-1').eq(2).click(); + cy.get('.input-group > .form-control').type('https://wallpaperplay.com/walls/full/8/2/b/72402.jpg'); + cy.get('.btn-primary').contains('Upload').click(); + + //To check if the added file is present in the Test Folder + cy.get('span.level-item > span').should('contain','Test Folder'); + cy.get('.list-row-container').eq(0).should('contain.text','72402.jpg'); + cy.get('.list-row-checkbox').eq(0).click(); + + //Deleting the added file from the Test folder + cy.get('.actions-btn-group > .btn').click(); + cy.get('.actions-btn-group > .dropdown-menu > li > .grey-link').eq(5).click(); + cy.wait(700); + cy.click_modal_primary_button('Yes', {force : true, delay: 700}); + cy.wait(700); + + //Deleting the Test Folder + cy.visit('/app/file/view/home/Attachments'); + cy.get('.list-row-checkbox').eq(0).click(); + cy.get('.actions-btn-group > .btn').click(); + cy.get('.actions-btn-group > .dropdown-menu > li > .grey-link').eq(5).click(); + cy.click_modal_primary_button('Yes'); + }); + + it('Deleting Test Folder from the home', () => { + //Deleting the Test Folder added in the home directory + cy.visit('/app/file/view/home'); + cy.get('.list-row-container > .list-row > .level-left > .list-subject > .list-row-checkbox').eq(0).click({force : true, delay : 500}); + cy.get('.actions-btn-group > .btn').click(); + cy.get('.actions-btn-group > .dropdown-menu > li > .grey-link').eq(5).click(); + cy.click_modal_primary_button('Yes', {force : true}); + }); +}); \ No newline at end of file From 09cfd3b0266652f31634d7565d49e2894bdeef47 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 10 Aug 2021 19:06:13 +0530 Subject: [PATCH 094/306] test: minor fix --- cypress/integration/workspace.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cypress/integration/workspace.js b/cypress/integration/workspace.js index b1e9fd759a..2c3a8434ee 100644 --- a/cypress/integration/workspace.js +++ b/cypress/integration/workspace.js @@ -27,17 +27,18 @@ context('Workspace 2.0', () => { }); it('Add New Block', () => { + cy.wait(500); cy.get('.codex-editor__redactor .ce-block'); cy.get('.standard-actions .btn-secondary[data-label=Customize]').click(); cy.get('.custom-actions .inner-group-button[data-label="Add%20Block"]').click(); cy.get('.custom-actions .inner-group-button .dropdown-menu .block-menu-item-label').contains('Heading').click(); - cy.get(".ce-block:last").type('Header'); + cy.get(".ce-block:last").find('h2').type('Header'); cy.get(".ce-block:last").find('.ce-header').should('exist'); cy.get('.custom-actions .inner-group-button[data-label="Add%20Block"]').click(); cy.get('.custom-actions .inner-group-button .dropdown-menu .block-menu-item-label').contains('Text').click(); - cy.get(".ce-block:last").type('Paragraph text'); + cy.get(".ce-block:last").find('.ce-paragraph').type('Paragraph text'); cy.get(".ce-block:last").find('.ce-paragraph').should('exist'); }); From 166574b1d065ac0c0461a671d7fe837a9d35b7ce Mon Sep 17 00:00:00 2001 From: Komal-Saraf0609 Date: Tue, 10 Aug 2021 19:10:27 +0530 Subject: [PATCH 095/306] test: Fixed sider issues --- cypress/integration/folder_navigation.js | 122 +++++++++++------------ 1 file changed, 61 insertions(+), 61 deletions(-) diff --git a/cypress/integration/folder_navigation.js b/cypress/integration/folder_navigation.js index 4a389101b5..d4fe569828 100644 --- a/cypress/integration/folder_navigation.js +++ b/cypress/integration/folder_navigation.js @@ -5,75 +5,75 @@ context('Folder Navigation', () => { cy.visit('/app/file'); }); - it('Adding Folders', () => { - //Adding filter to go into the home folder - cy.get('.filter-selector > .btn').click(); - cy.get('.filter-action-buttons > div > .btn-secondary').contains('Clear Filters').click(); - cy.get('.filter-action-buttons > .text-muted').click(); - cy.get('.fieldname-select-area > .awesomplete > .form-control').type('Fol{enter}'); - cy.get('.filter-field > .form-group > .link-field > .awesomplete > .input-with-feedback').type('Home{enter}'); - cy.get('.filter-action-buttons > div > .btn-primary').click(); - - //Adding folder (Test Folder) - cy.get('.menu-btn-group > .btn').click(); - cy.get('.menu-btn-group > .dropdown-menu > .user-action > .grey-link').eq(2).click(); - cy.get('form > .frappe-control > .form-group > .control-input-wrapper > .control-input > .input-with-feedback').type('Test Folder'); - cy.get('.modal-footer > .standard-actions > .btn-primary').click(); - }); + it('Adding Folders', () => { + //Adding filter to go into the home folder + cy.get('.filter-selector > .btn').click(); + cy.get('.filter-action-buttons > div > .btn-secondary').contains('Clear Filters').click(); + cy.get('.filter-action-buttons > .text-muted').click(); + cy.get('.fieldname-select-area > .awesomplete > .form-control').type('Fol{enter}'); + cy.get('.filter-field > .form-group > .link-field > .awesomplete > .input-with-feedback').type('Home{enter}'); + cy.get('.filter-action-buttons > div > .btn-primary').click(); - it('Navigating the nested folders, checking if the URL formed is correct, checking if the added content in the child folder is correct', () => { - //Navigating inside the Attachments folder - cy.get('[title="Attachments"] > span').click(); + //Adding folder (Test Folder) + cy.get('.menu-btn-group > .btn').click(); + cy.get('.menu-btn-group > .dropdown-menu > .user-action > .grey-link').eq(2).click(); + cy.get('form > .frappe-control > .form-group > .control-input-wrapper > .control-input > .input-with-feedback').type('Test Folder'); + cy.get('.modal-footer > .standard-actions > .btn-primary').click(); + }); + + it('Navigating the nested folders, checking if the URL formed is correct, checking if the added content in the child folder is correct', () => { + //Navigating inside the Attachments folder + cy.get('[title="Attachments"] > span').click(); - //To check if the URL formed after visiting the attachments folder is correct - cy.location('pathname').should('eq', '/app/file/view/home/Attachments'); - cy.visit('/app/file/view/home/Attachments'); + //To check if the URL formed after visiting the attachments folder is correct + cy.location('pathname').should('eq', '/app/file/view/home/Attachments'); + cy.visit('/app/file/view/home/Attachments'); - //Adding folder inside the attachments folder - cy.get('.menu-btn-group > .btn').click(); - cy.get('.menu-btn-group > .dropdown-menu > .user-action > .grey-link').eq(2).click(); - cy.get('form > .frappe-control > .form-group > .control-input-wrapper > .control-input > .input-with-feedback').type('Test Folder'); - cy.get('.modal-footer > .standard-actions > .btn-primary').click(); + //Adding folder inside the attachments folder + cy.get('.menu-btn-group > .btn').click(); + cy.get('.menu-btn-group > .dropdown-menu > .user-action > .grey-link').eq(2).click(); + cy.get('form > .frappe-control > .form-group > .control-input-wrapper > .control-input > .input-with-feedback').type('Test Folder'); + cy.get('.modal-footer > .standard-actions > .btn-primary').click(); - //Navigating inside the added folder in the Attachments folder - cy.get('[title="Test Folder"] > span').click(); + //Navigating inside the added folder in the Attachments folder + cy.get('[title="Test Folder"] > span').click(); - //To check if the URL is correct after visiting the Test Folder - cy.location('pathname').should('eq', '/app/file/view/home/Attachments/Test%20Folder'); - cy.visit('/app/file/view/home/Attachments/Test%20Folder'); + //To check if the URL is correct after visiting the Test Folder + cy.location('pathname').should('eq', '/app/file/view/home/Attachments/Test%20Folder'); + cy.visit('/app/file/view/home/Attachments/Test%20Folder'); - //Adding a file inside the Test Folder - cy.get('.primary-action').contains('Add File').eq(0).click({force : true}); - cy.get('.mt-2 > .btn > .mt-1').eq(2).click(); - cy.get('.input-group > .form-control').type('https://wallpaperplay.com/walls/full/8/2/b/72402.jpg'); - cy.get('.btn-primary').contains('Upload').click(); + //Adding a file inside the Test Folder + cy.get('.primary-action').contains('Add File').eq(0).click({force: true}); + cy.get('.mt-2 > .btn > .mt-1').eq(2).click(); + cy.get('.input-group > .form-control').type('https://wallpaperplay.com/walls/full/8/2/b/72402.jpg'); + cy.get('.btn-primary').contains('Upload').click(); - //To check if the added file is present in the Test Folder - cy.get('span.level-item > span').should('contain','Test Folder'); - cy.get('.list-row-container').eq(0).should('contain.text','72402.jpg'); - cy.get('.list-row-checkbox').eq(0).click(); + //To check if the added file is present in the Test Folder + cy.get('span.level-item > span').should('contain', 'Test Folder'); + cy.get('.list-row-container').eq(0).should('contain.text', '72402.jpg'); + cy.get('.list-row-checkbox').eq(0).click(); - //Deleting the added file from the Test folder - cy.get('.actions-btn-group > .btn').click(); - cy.get('.actions-btn-group > .dropdown-menu > li > .grey-link').eq(5).click(); - cy.wait(700); - cy.click_modal_primary_button('Yes', {force : true, delay: 700}); - cy.wait(700); + //Deleting the added file from the Test folder + cy.get('.actions-btn-group > .btn').click(); + cy.get('.actions-btn-group > .dropdown-menu > li > .grey-link').eq(5).click(); + cy.wait(700); + cy.click_modal_primary_button('Yes', {force: true, delay: 700}); + cy.wait(700); - //Deleting the Test Folder - cy.visit('/app/file/view/home/Attachments'); - cy.get('.list-row-checkbox').eq(0).click(); - cy.get('.actions-btn-group > .btn').click(); - cy.get('.actions-btn-group > .dropdown-menu > li > .grey-link').eq(5).click(); - cy.click_modal_primary_button('Yes'); - }); + //Deleting the Test Folder + cy.visit('/app/file/view/home/Attachments'); + cy.get('.list-row-checkbox').eq(0).click(); + cy.get('.actions-btn-group > .btn').click(); + cy.get('.actions-btn-group > .dropdown-menu > li > .grey-link').eq(5).click(); + cy.click_modal_primary_button('Yes'); + }); - it('Deleting Test Folder from the home', () => { - //Deleting the Test Folder added in the home directory - cy.visit('/app/file/view/home'); - cy.get('.list-row-container > .list-row > .level-left > .list-subject > .list-row-checkbox').eq(0).click({force : true, delay : 500}); - cy.get('.actions-btn-group > .btn').click(); - cy.get('.actions-btn-group > .dropdown-menu > li > .grey-link').eq(5).click(); - cy.click_modal_primary_button('Yes', {force : true}); - }); + it('Deleting Test Folder from the home', () => { + //Deleting the Test Folder added in the home directory + cy.visit('/app/file/view/home'); + cy.get('.list-row-container > .list-row > .level-left > .list-subject > .list-row-checkbox').eq(0).click({force: true, delay: 500}); + cy.get('.actions-btn-group > .btn').click(); + cy.get('.actions-btn-group > .dropdown-menu > li > .grey-link').eq(5).click(); + cy.click_modal_primary_button('Yes', {force: true}); + }); }); \ No newline at end of file From 1619f967919f7a039e6286100a7b82e60a946c0e Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 10 Aug 2021 21:14:35 +0530 Subject: [PATCH 096/306] fix: adding child page to sidebar minor fix --- frappe/public/js/frappe/views/workspace/workspace.js | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index 4cbede34e6..a7bb58e6a1 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -633,15 +633,13 @@ frappe.views.Workspace = class Workspace { ); $sidebar_item.find('.sidebar-item-control .drag-handle').css('margin-right', '8px'); + let $sidebar_section = is_public ? $sidebar[0] : $sidebar[1]; + if (!parent) { - if (is_public) { - $sidebar_item.appendTo($sidebar[0]); - } else { - $sidebar.last().removeClass('hidden'); - $sidebar_item.appendTo($sidebar[1]); - } + !is_public && $sidebar.last().removeClass('hidden'); + $sidebar_item.appendTo($sidebar_section); } else { - let $item_container = $sidebar.find(`[item-name="${parent}"]`); + let $item_container = $($sidebar_section).find(`[item-name="${parent}"]`); let $child_section = $item_container.find('.sidebar-child-item'); let $drop_icon = $item_container.find('.drop-icon'); if (!$child_section[0]) { From 46c6b6621e1d5b331070ce521dc80f2c4cc2c4bc Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 11 Aug 2021 20:00:46 +0530 Subject: [PATCH 097/306] refactor: Newsletter * Re-send Newsletter only to the recipients who haven't received it yet (Check Email Queue before setting email recipients) * Re-structed code, broken larger methods to "byte" sized "bits" (hehe) * Added validations for recipients list * Added Newsletter.newsletter_recipients property * Used newer APIs and Fixed namespaces for usages/imports * Added convenience methods for Newsletter APIs * Added type annotations for all(?) methods --- frappe/email/doctype/newsletter/newsletter.py | 380 +++++++++++------- 1 file changed, 224 insertions(+), 156 deletions(-) diff --git a/frappe/email/doctype/newsletter/newsletter.py b/frappe/email/doctype/newsletter/newsletter.py index 97d77549b7..5f420785e1 100755 --- a/frappe/email/doctype/newsletter/newsletter.py +++ b/frappe/email/doctype/newsletter/newsletter.py @@ -1,241 +1,309 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: GNU General Public License v3. See license.txt +from typing import Dict, List + import frappe import frappe.utils -from frappe import throw, _ + +from frappe import _ from frappe.website.website_generator import WebsiteGenerator from frappe.utils.verified_command import get_signed_params, verify_request from frappe.email.doctype.email_group.email_group import add_subscribers -from frappe.utils import parse_addr, now_datetime, markdown, validate_email_address + class Newsletter(WebsiteGenerator): def onload(self): - if self.email_sent: - self.get("__onload").status_count = dict(frappe.db.sql("""select status, count(name) - from `tabEmail Queue` where reference_doctype=%s and reference_name=%s - group by status""", (self.doctype, self.name))) or None + self.setup_newsletter_status() def validate(self): - self.route = "newsletters/" + self.name - if self.send_from: - validate_email_address(self.send_from, True) + self.route = f"newsletters/{self.name}" + self.validate_sender_address() + self.validate_recipient_address() + + @property + def newsletter_recipients(self) -> List[str]: + if getattr(self, "_recipients", None) == None: + self._recipients = self.get_recipients() + return self._recipients @frappe.whitelist() - def test_send(self, doctype="Lead"): - self.recipients = frappe.utils.split_emails(self.test_email_id) - self.queue_all(test_email=True) + def test_send(self): + test_emails = frappe.utils.split_emails(self.test_email_id) + self.queue_all(test_email=test_emails) frappe.msgprint(_("Test email sent to {0}").format(self.test_email_id)) @frappe.whitelist() def send_emails(self): """send emails to leads and customers""" if self.email_sent: - throw(_("Newsletter has already been sent")) + frappe.throw(_("Newsletter has already been sent")) - self.recipients = self.get_recipients() + if not self.newsletter_recipients: + frappe.throw(_("Newsletter should have atleast one recipient")) - if self.recipients: - self.queue_all() - frappe.msgprint(_("Email queued to {0} recipients").format(len(self.recipients))) + self.queue_all() + frappe.msgprint(_("Email queued to {0} recipients").format(len(self.newsletter_recipients))) - else: - frappe.msgprint(_("Newsletter should have atleast one recipient")) + def setup_newsletter_status(self): + """Setup analytical status for current Newsletter. Can be accessible from desk. + """ + if self.email_sent: + status_count = frappe.get_all("Email Queue", + filters={"reference_doctype": self.doctype, "reference_name": self.name}, + fields=["status", "count(name)"], + group_by="status", + as_list=True, + ) + self.get("__onload").status_count = dict(status_count) + + def validate_sender_address(self): + """Validate self.send_from is a valid email address or not. + """ + if self.send_from: + frappe.utils.validate_email_address(self.send_from, throw=True) - def queue_all(self, test_email=False): - if not self.get("recipients"): - # in case it is called via worker - self.recipients = self.get_recipients() + def validate_recipient_address(self): + """Validate if self.newsletter_recipients are all valid email addresses or not. + """ + for recipient in self.newsletter_recipients: + frappe.utils.validate_email_address(recipient, throw=True) - self.validate_send() + def validate_send(self): + """Validate if Newsletter can be sent. + """ + if self.get("__islocal"): + frappe.throw(_("Please save the Newsletter before sending")) - sender = self.send_from or frappe.utils.get_formatted_email(self.owner) + if not self.newsletter_recipients: + frappe.throw(_("Newsletter should have at least one recipient")) - if not frappe.flags.in_test: - frappe.db.auto_commit_on_many_writes = True + def get_linked_email_queue(self) -> List[str]: + """Get list of email queue linked to this newsletter. + """ + return frappe.get_all("Email Queue", + filters={ + "reference_doctype": self.doctype, + "reference_name": self.name, + }, + pluck="name", + ) + def get_success_recipients(self) -> List[str]: + """Recipients who have already recieved the newsletter. + + Couldn't think of a better name ;) + """ + return frappe.get_all("Email Queue Recipient", + filters={ + "status": ("in", ["Not Sent", "Sending", "Sent"]), + "parentfield": ("in", self.get_linked_email_queue()), + }, + pluck="recipient", + ) + + def get_pending_recipients(self) -> List[str]: + """Get list of pending recipients of the newsletter. These + recipients may not have receive the newsletter in the previous iteration. + """ + return [ + x for x in self.newsletter_recipients if x not in self.get_success_recipients() + ] + + def queue_all(self, test_email: str = None): + """Queue Newsletter to all the recipients generated from the `Email Group` + table + + Args: + test_email (str, optional): Send test Newsletter to set email. Defaults to None. + """ + if test_email: + frappe.utils.validate_email_address(test_email, throw=True) + else: + self.validate() + self.validate_send() + + newsletter_recipients = test_email or self.get_pending_recipients() + self.send_newsletter(emails=newsletter_recipients) + + if not test_email: + self.email_sent = True + self.schedule_send = frappe.utils.now_datetime() + self.scheduled_to_send = len(newsletter_recipients) + self.save() + + def get_attachments(self) -> List[Dict[str, str]]: + """Get list of attachments on current Newsletter + """ attachments = [] + if self.send_attachments: - files = frappe.get_all("File", fields=["name"], filters={"attached_to_doctype": "Newsletter", - "attached_to_name": self.name}, order_by="creation desc") - - for file in files: - try: - # these attachments will be attached on-demand - # and won't be stored in the message - attachments.append({"fid": file.name}) - except IOError: - frappe.throw(_("Unable to find attachment {0}").format(file.name)) - - args = { - "message": self.get_message(), - "name": self.name - } - frappe.sendmail(recipients=self.recipients, sender=sender, - subject=self.subject, message=self.get_message(), template="newsletter", - reference_doctype=self.doctype, reference_name=self.name, - add_unsubscribe_link=self.send_unsubscribe_link, attachments=attachments, + files = frappe.get_all( + "File", + filters={"attached_to_doctype": "Newsletter", "attached_to_name": self.name}, + order_by="creation desc", + pluck="name", + ) + attachments.extend({"fid": file} for file in files) + + return attachments + + def send_newsletter(self, emails: List[str]): + # TODO: get rid of this maybe? + message = self.get_message() + attachments = self.get_attachments() + sender = self.send_from or frappe.utils.get_formatted_email(self.owner) + args = {"message": message, "name": self.name} + + frappe.db.auto_commit_on_many_writes = not frappe.flags.in_test + + frappe.sendmail( + subject=self.subject, + sender=sender, + recipients=emails, + message=message, + attachments=attachments, + template="newsletter", + add_unsubscribe_link=self.send_unsubscribe_link, unsubscribe_method="/unsubscribe", unsubscribe_params={"name": self.name}, - send_priority=0, queue_separately=True, args=args) - - if not frappe.flags.in_test: - frappe.db.auto_commit_on_many_writes = False + reference_doctype=self.doctype, + reference_name=self.name, + queue_separately=True, + send_priority=0, + args=args, + ) - if not test_email: - self.db_set("email_sent", 1) - self.db_set("schedule_send", now_datetime()) - self.db_set("scheduled_to_send", len(self.recipients)) + frappe.db.auto_commit_on_many_writes = not frappe.flags.in_test - def get_message(self): + def get_message(self) -> str: if self.content_type == "HTML": return frappe.render_template(self.message_html, {"doc": self.as_dict()}) - return { - 'Rich Text': self.message, - 'Markdown': markdown(self.message_md) - }[self.content_type or 'Rich Text'] + if self.content_type == "Markdown": + return frappe.utils.markdown(self.message_md) + # fallback to Rich Text + return self.message - def get_recipients(self): + def get_recipients(self) -> List[str]: """Get recipients from Email Group""" - recipients_list = [] - for email_group in get_email_groups(self.name): - for d in frappe.db.get_all("Email Group Member", ["email"], - {"unsubscribed": 0, "email_group": email_group.email_group}): - recipients_list.append(d.email) - return list(set(recipients_list)) + emails = frappe.get_all( + "Email Group Member", + filters={"unsubscribed": 0, "email_group": ("in", self.get_email_groups())}, + pluck="email", + ) + return list(set(emails)) - def validate_send(self): - if self.get("__islocal"): - throw(_("Please save the Newsletter before sending")) + def get_email_groups(self) -> List[str]: + return frappe.db.get_all( + "Newsletter Email Group", + filters={"parent": self.name, "parenttype": "Newsletter"}, + pluck="email_group", + ) - if not self.recipients: - frappe.throw(_("Newsletter should have at least one recipient")) + def get_attachments(self) -> List[Dict]: + return frappe.get_all( + "File", + fields=["name", "file_name", "file_url", "is_private"], + filters={ + "attached_to_name": self.name, + "attached_to_doctype": "Newsletter", + "is_private": 0, + }, + ) def get_context(self, context): newsletters = get_newsletter_list("Newsletter", None, None, 0) if newsletters: newsletter_list = [d.name for d in newsletters] if self.name not in newsletter_list: - frappe.redirect_to_message(_('Permission Error'), - _("You are not permitted to view the newsletter.")) + frappe.redirect_to_message( + _("Permission Error"), _("You are not permitted to view the newsletter.") + ) frappe.local.flags.redirect_location = frappe.local.response.location raise frappe.Redirect else: - context.attachments = get_attachments(self.name) + context.attachments = self.get_attachments() context.no_cache = 1 context.show_sidebar = True -def get_attachments(name): - return frappe.get_all("File", - fields=["name", "file_name", "file_url", "is_private"], - filters = {"attached_to_name": name, "attached_to_doctype": "Newsletter", "is_private":0}) - - -def get_email_groups(name): - return frappe.db.get_all("Newsletter Email Group", ["email_group"],{"parent":name, "parenttype":"Newsletter"}) - - @frappe.whitelist(allow_guest=True) def confirmed_unsubscribe(email, group): """ unsubscribe the email(user) from the mailing list(email_group) """ - frappe.flags.ignore_permissions=True + frappe.flags.ignore_permissions = True doc = frappe.get_doc("Email Group Member", {"email": email, "email_group": group}) if not doc.unsubscribed: doc.unsubscribed = 1 - doc.save(ignore_permissions = True) - -def create_lead(email_id): - """create a lead if it does not exist""" - from frappe.model.naming import get_default_naming_series - full_name, email_id = parse_addr(email_id) - if frappe.db.get_value("Lead", {"email_id": email_id}): - return - - lead = frappe.get_doc({ - "doctype": "Lead", - "email_id": email_id, - "lead_name": full_name or email_id, - "status": "Lead", - "naming_series": get_default_naming_series("Lead"), - "company": frappe.db.get_default("Company"), - "source": "Email" - }) - lead.insert() + doc.save(ignore_permissions=True) @frappe.whitelist(allow_guest=True) -def subscribe(email, email_group=_('Website')): - url = frappe.utils.get_url("/api/method/frappe.email.doctype.newsletter.newsletter.confirm_subscription") +\ - "?" + get_signed_params({"email": email, "email_group": email_group}) - - email_template = frappe.db.get_value('Email Group', email_group, ['confirmation_email_template']) - - content='' - if email_template: - args = dict( - email=email, - confirmation_url=url, - email_group=email_group - ) - - email_template = frappe.get_doc("Email Template", email_template) +def subscribe(email, email_group=_("Website")): + """API endpoint to subscribe an email to a particular email group. Triggers a confirmation email. + """ + + # build subscription confirmation URL + api_endpoint = frappe.utils.get_url( + "/api/method/frappe.email.doctype.newsletter.newsletter.confirm_subscription" + ) + signed_params = get_signed_params({"email": email, "email_group": email_group}) + confirm_subscription_url = f"{api_endpoint}?{signed_params}" + + # fetch custom template if available + email_confirmation_template = frappe.db.get_value( + "Email Group", email_group, "confirmation_email_template" + ) + + # build email and send + if email_confirmation_template: + args = {"email": email, "confirmation_url": confirm_subscription_url, "email_group": email_group} + email_template = frappe.get_doc("Email Template", email_confirmation_template) + email_subject = email_template.subject content = frappe.render_template(email_template.response, args) - - if not content: - messages = ( + else: + email_subject = _("Confirm Your Email") + translatable_content = ( _("Thank you for your interest in subscribing to our updates"), _("Please verify your Email Address"), - url, - _("Click here to verify") + confirm_subscription_url, + _("Click here to verify"), ) - content = """ -

{0}. {1}.

-

{3}

- """.format(*messages) +

{0}. {1}.

+

{3}

+ """.format(*translatable_content) + + frappe.sendmail( + email, + subject=email_subject, + content=content, + now=True, + ) - frappe.sendmail(email, subject=getattr('email_template', 'subject', '') or _("Confirm Your Email"), content=content, now=True) @frappe.whitelist(allow_guest=True) -def confirm_subscription(email, email_group=_('Website')): +def confirm_subscription(email, email_group=_("Website")): + """API endpoint to confirm email subscription. + This endpoint is called when user clicks on the link sent to their mail. + """ if not verify_request(): return if not frappe.db.exists("Email Group", email_group): - frappe.get_doc({ - "doctype": "Email Group", - "title": email_group - }).insert(ignore_permissions=True) + frappe.get_doc({"doctype": "Email Group", "title": email_group}).insert( + ignore_permissions=True + ) frappe.flags.ignore_permissions = True add_subscribers(email_group, email) frappe.db.commit() - frappe.respond_as_web_page(_("Confirmed"), + frappe.respond_as_web_page( + _("Confirmed"), _("{0} has been successfully added to the Email Group.").format(email), - indicator_color='green') - - -def send_newsletter(newsletter): - try: - doc = frappe.get_doc("Newsletter", newsletter) - doc.queue_all() - - except: - frappe.db.rollback() - - # wasn't able to send emails :( - doc.db_set("email_sent", 0) - frappe.db.commit() - - frappe.log_error(title='Send Newsletter') - - raise - - else: - frappe.db.commit() + indicator_color="green", + ) def get_list_context(context=None): From e80d5f25c6259ef2fb6fdddff7dfc61a8f77354c Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 11 Aug 2021 20:12:50 +0530 Subject: [PATCH 098/306] refactor: Newsletter failure handling Don't raise after handling generic Exception class. Just log error and go on. This way, other newsletters will continue to loop instead of breaking after one failure Added more context (docname) to logged error --- frappe/email/doctype/newsletter/newsletter.py | 34 +++++++++++++++---- 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/frappe/email/doctype/newsletter/newsletter.py b/frappe/email/doctype/newsletter/newsletter.py index 5f420785e1..8857952a29 100755 --- a/frappe/email/doctype/newsletter/newsletter.py +++ b/frappe/email/doctype/newsletter/newsletter.py @@ -336,12 +336,34 @@ def get_newsletter_list(doctype, txt, filters, limit_start, limit_page_length=20 '''.format(','.join(['%s'] * len(email_group_list)), limit_page_length, limit_start), email_group_list, as_dict=1) + def send_scheduled_email(): """Send scheduled newsletter to the recipients.""" - scheduled_newsletter = frappe.get_all('Newsletter', filters = { - 'schedule_send': ('<=', now_datetime()), - 'email_sent': 0, - 'schedule_sending': 1 - }, fields = ['name'], ignore_ifnull=True) + scheduled_newsletter = frappe.get_all( + "Newsletter", + filters={ + "schedule_send": ("<=", frappe.utils.now_datetime()), + "email_sent": False, + "schedule_sending": True, + }, + ignore_ifnull=True, + pluck="name", + ) + for newsletter in scheduled_newsletter: - send_newsletter(newsletter.name) + try: + frappe.get_doc("Newsletter", newsletter).queue_all() + + except Exception: + frappe.db.rollback() + + # wasn't able to send emails :( + frappe.db.set_value("Newsletter", newsletter, "email_sent", 0) + message = ( + f"Newsletter {newsletter} failed to send" + "\n\n" + f"Traceback: {frappe.get_traceback()}" + ) + frappe.log_error(title="Send Newsletter", message=message) + + frappe.db.commit() From cda48832f459a2eefbead43d5004cbe72759d5db Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 11 Aug 2021 20:42:57 +0530 Subject: [PATCH 099/306] chore(test): Update API usages Striving for better readability * Use frappe.db.delete instead of frappe.db.sql * Use named kwargs instead of positional --- .../doctype/newsletter/test_newsletter.py | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/frappe/email/doctype/newsletter/test_newsletter.py b/frappe/email/doctype/newsletter/test_newsletter.py index 3abd339ed9..c1f6c7d4a9 100644 --- a/frappe/email/doctype/newsletter/test_newsletter.py +++ b/frappe/email/doctype/newsletter/test_newsletter.py @@ -24,7 +24,7 @@ emails = [ class TestNewsletter(unittest.TestCase): def setUp(self): frappe.set_user("Administrator") - frappe.db.sql("delete from `tabEmail Group Member`") + frappe.db.delete("Email Group Member") if not frappe.db.exists("Email Group", "_Test Email Group"): frappe.get_doc({"doctype": "Email Group", "title": "_Test Email Group"}).insert() @@ -66,9 +66,10 @@ class TestNewsletter(unittest.TestCase): @staticmethod def send_newsletter(published=0, schedule_send=None): - frappe.db.sql("delete from `tabEmail Queue`") - frappe.db.sql("delete from `tabEmail Queue Recipient`") - frappe.db.sql("delete from `tabNewsletter`") + frappe.db.delete("Email Queue") + frappe.db.delete("Email Queue Recipient") + frappe.db.delete("Newsletter") + newsletter = frappe.get_doc({ "doctype": "Newsletter", "subject": "_Test Newsletter", @@ -78,26 +79,26 @@ class TestNewsletter(unittest.TestCase): "published": published, "schedule_sending": bool(schedule_send), "schedule_send": schedule_send - }).insert(ignore_permissions=True) - + }) + newsletter.insert(ignore_permissions=True) newsletter.append("email_group", {"email_group": "_Test Email Group"}) newsletter.save() + if schedule_send: send_scheduled_email() - return - - newsletter.send_emails() - return newsletter.name + else: + newsletter.send_emails() + return newsletter.name def test_portal(self): - self.send_newsletter(1) + self.send_newsletter(published=1) frappe.set_user("test1@example.com") newsletters = get_newsletter_list("Newsletter", None, None, 0) self.assertEqual(len(newsletters), 1) def test_newsletter_context(self): context = frappe._dict() - newsletter_name = self.send_newsletter(1) + newsletter_name = self.send_newsletter(published=1) frappe.set_user("test2@example.com") doc = frappe.get_doc("Newsletter", newsletter_name) doc.get_context(context) From b28a5beb539dd54cda18d9c1015f0715a414d322 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 11 Aug 2021 21:01:56 +0530 Subject: [PATCH 100/306] refactor(minor): Newsletter Controller * Resolve conflicting methods in the controller * Add docstring --- frappe/email/doctype/newsletter/newsletter.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/frappe/email/doctype/newsletter/newsletter.py b/frappe/email/doctype/newsletter/newsletter.py index 8857952a29..1ad0538036 100755 --- a/frappe/email/doctype/newsletter/newsletter.py +++ b/frappe/email/doctype/newsletter/newsletter.py @@ -23,7 +23,7 @@ class Newsletter(WebsiteGenerator): @property def newsletter_recipients(self) -> List[str]: - if getattr(self, "_recipients", None) == None: + if getattr(self, "_recipients", None) is None: self._recipients = self.get_recipients() return self._recipients @@ -132,7 +132,7 @@ class Newsletter(WebsiteGenerator): self.scheduled_to_send = len(newsletter_recipients) self.save() - def get_attachments(self) -> List[Dict[str, str]]: + def get_newsletter_attachments(self) -> List[Dict[str, str]]: """Get list of attachments on current Newsletter """ attachments = [] @@ -149,9 +149,11 @@ class Newsletter(WebsiteGenerator): return attachments def send_newsletter(self, emails: List[str]): + """Trigger email generation for `emails` and add it in Email Queue. + """ # TODO: get rid of this maybe? message = self.get_message() - attachments = self.get_attachments() + attachments = self.get_newsletter_attachments() sender = self.send_from or frappe.utils.get_formatted_email(self.owner) args = {"message": message, "name": self.name} @@ -200,7 +202,7 @@ class Newsletter(WebsiteGenerator): pluck="email_group", ) - def get_attachments(self) -> List[Dict]: + def get_attachments(self) -> List[Dict[str, str]]: return frappe.get_all( "File", fields=["name", "file_name", "file_url", "is_private"], From 5372a73ca472148a11982650bf23c06637a9cff8 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 12 Aug 2021 10:44:09 +0530 Subject: [PATCH 101/306] fix: Generate Custom Report & Custom Documents Card --- .../js/frappe/views/workspace/workspace.js | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index a7bb58e6a1..145cd3f56e 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -314,6 +314,9 @@ frappe.views.Workspace = class Workspace { let this_page = pages.filter(p => p.title == page.name)[0]; this.setup_actions(page); this.content = this_page && JSON.parse(this_page.content); + + this.add_custom_cards_in_content(); + $('.item-anchor').addClass('disable-click'); this.get_data(this_page).then(() => { this.prepare_editorjs(); @@ -324,6 +327,15 @@ frappe.views.Workspace = class Workspace { } } + add_custom_cards_in_content() { + let index = -1; + this.content.find((item, i) => { if (item.type == 'card') index = i }); + if (index !== -1) { + this.content.splice(index+1, 0, {"type": "card", "data": {"card_name": "Custom Documents", "col": 4}}); + this.content.splice(index+2, 0, {"type": "card", "data": {"card_name": "Custom Reports", "col": 4}}); + } + } + prepare_editorjs() { if (this.editor) { this.editor.isReady.then(() => { @@ -690,6 +702,12 @@ frappe.views.Workspace = class Workspace { } }); + let blocks = outputData.blocks.filter( + item => item.type != 'card' || + (item.data.card_name !== 'Custom Documents' && + item.data.card_name !== 'Custom Reports') + ); + frappe.call({ method: "frappe.desk.doctype.workspace.workspace.save_page", args: { @@ -701,7 +719,7 @@ frappe.views.Workspace = class Workspace { sb_private_items: me.sorted_private_items, deleted_pages: me.deleted_sidebar_items, new_widgets: new_widgets, - blocks: JSON.stringify(outputData.blocks), + blocks: JSON.stringify(blocks), save: save }, callback: function(res) { From f8a673618336636b791f05f1de2ef2a5012df20e Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 12 Aug 2021 10:57:05 +0530 Subject: [PATCH 102/306] fix: Removing hide cards feature --- frappe/public/js/frappe/widgets/base_widget.js | 1 - 1 file changed, 1 deletion(-) diff --git a/frappe/public/js/frappe/widgets/base_widget.js b/frappe/public/js/frappe/widgets/base_widget.js index b9e60ea008..e6ae64d9dc 100644 --- a/frappe/public/js/frappe/widgets/base_widget.js +++ b/frappe/public/js/frappe/widgets/base_widget.js @@ -101,7 +101,6 @@ export default class Widget { make_widget() { this.widget = $(`
From e8d958dd3ef7f9c8be7e480574aab73c2b8ac98b Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 12 Aug 2021 11:09:31 +0530 Subject: [PATCH 103/306] fix: sider fix --- frappe/public/js/frappe/views/workspace/workspace.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index 145cd3f56e..f4779e9733 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -329,7 +329,9 @@ frappe.views.Workspace = class Workspace { add_custom_cards_in_content() { let index = -1; - this.content.find((item, i) => { if (item.type == 'card') index = i }); + this.content.find((item, i) => { + if (item.type == 'card') index = i; + }); if (index !== -1) { this.content.splice(index+1, 0, {"type": "card", "data": {"card_name": "Custom Documents", "col": 4}}); this.content.splice(index+2, 0, {"type": "card", "data": {"card_name": "Custom Reports", "col": 4}}); From b897a41b088a564f63f80b28d4413bd2aaa1485f Mon Sep 17 00:00:00 2001 From: Komal-Saraf0609 Date: Thu, 12 Aug 2021 13:25:24 +0530 Subject: [PATCH 104/306] test: Added test script for dashboard links (tests if any doc is added to any dashboard connection, the counter for it is updated or not) --- cypress/integration/dashboard_links.js | 39 ++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 cypress/integration/dashboard_links.js diff --git a/cypress/integration/dashboard_links.js b/cypress/integration/dashboard_links.js new file mode 100644 index 0000000000..4a3a7e25ed --- /dev/null +++ b/cypress/integration/dashboard_links.js @@ -0,0 +1,39 @@ +context('Dashboard links', () => { + before(() => { + cy.visit('/login'); + cy.login(); + cy.visit('/app/user'); + }); + + it('Adding a new contact, checking for the counter on the dashboard and deleting the created contact', () => { + cy.get('.list-row-col > .level-item > .ellipsis').eq(0).click(); + + //To check if initially the dashboard contains only the "Contact" link and there is no counter + cy.get('[data-doctype="Contact"]').should('contain','Contact'); + + //Adding a new contact + cy.get('.btn[data-doctype="Contact"]').click(); + cy.get('.has-error > .form-group > .control-input-wrapper > .control-input > .input-with-feedback').type('Admin'); + cy.get('#page-Contact > .page-head > .container > .row > .col > .standard-actions > .primary-action').click(); + cy.visit('/app/user'); + cy.get('.list-row-col > .level-item > .ellipsis').eq(0).click(); + + //To check if the counter for contact doc is "1" after adding the contact + cy.get('[data-doctype="Contact"] > .count').should('contain','1'); + cy.get('[data-doctype="Contact"]').contains('Contact').click(); + + //Deleting the newly created contact + cy.visit('/app/contact'); + cy.get('.list-subject > .select-like > .list-row-checkbox').eq(0).click(); + cy.get('.actions-btn-group > .btn').contains('Actions').click(); + cy.get('.actions-btn-group > .dropdown-menu > li > .grey-link').eq(5).click(); + cy.get('.modal-footer > .standard-actions > .btn-primary').contains('Yes').click({delay : 700}); + + + //To check if the counter from the "Contact" doc link is removed + cy.visit('/app/user'); + cy.wait(700); + cy.get('.list-row-col > .level-item > .ellipsis').eq(0).click(); + cy.get('[data-doctype="Contact"]').should('contain','Contact'); + }); +}); \ No newline at end of file From 06efca0fa659afb6437cc8ad525807baa37c14e2 Mon Sep 17 00:00:00 2001 From: Komal-Saraf0609 Date: Thu, 12 Aug 2021 13:48:03 +0530 Subject: [PATCH 105/306] test: Fixed sider issues --- cypress/integration/dashboard_links.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cypress/integration/dashboard_links.js b/cypress/integration/dashboard_links.js index 4a3a7e25ed..6bf2d22dad 100644 --- a/cypress/integration/dashboard_links.js +++ b/cypress/integration/dashboard_links.js @@ -9,7 +9,7 @@ context('Dashboard links', () => { cy.get('.list-row-col > .level-item > .ellipsis').eq(0).click(); //To check if initially the dashboard contains only the "Contact" link and there is no counter - cy.get('[data-doctype="Contact"]').should('contain','Contact'); + cy.get('[data-doctype="Contact"]').should('contain', 'Contact'); //Adding a new contact cy.get('.btn[data-doctype="Contact"]').click(); @@ -19,7 +19,7 @@ context('Dashboard links', () => { cy.get('.list-row-col > .level-item > .ellipsis').eq(0).click(); //To check if the counter for contact doc is "1" after adding the contact - cy.get('[data-doctype="Contact"] > .count').should('contain','1'); + cy.get('[data-doctype="Contact"] > .count').should('contain', '1'); cy.get('[data-doctype="Contact"]').contains('Contact').click(); //Deleting the newly created contact @@ -27,13 +27,13 @@ context('Dashboard links', () => { cy.get('.list-subject > .select-like > .list-row-checkbox').eq(0).click(); cy.get('.actions-btn-group > .btn').contains('Actions').click(); cy.get('.actions-btn-group > .dropdown-menu > li > .grey-link').eq(5).click(); - cy.get('.modal-footer > .standard-actions > .btn-primary').contains('Yes').click({delay : 700}); + cy.get('.modal-footer > .standard-actions > .btn-primary').contains('Yes').click({delay: 700}); //To check if the counter from the "Contact" doc link is removed cy.visit('/app/user'); cy.wait(700); cy.get('.list-row-col > .level-item > .ellipsis').eq(0).click(); - cy.get('[data-doctype="Contact"]').should('contain','Contact'); + cy.get('[data-doctype="Contact"]').should('contain', 'Contact'); }); }); \ No newline at end of file From fa53d7473ead5eed0bbb7acedfcad7b68468e927 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 12 Aug 2021 15:55:34 +0530 Subject: [PATCH 106/306] fix: Updated Public Page edit restriction message for user without access --- frappe/public/js/frappe/views/workspace/workspace.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index f4779e9733..41bd278e57 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -445,9 +445,9 @@ frappe.views.Workspace = class Workspace { if (!item.is_editable) { $(`${frappe.utils.icon("lock", "sm")}`) .appendTo(sidebar_control); - sidebar_control.find('.sidebar-info').click(() => { + sidebar_control.parent().click(() => { frappe.show_alert({ - message: __("Only owner can sort of edit this page"), + message: __("Only Workspace Manager can sort or edit this page"), indicator: 'info' }, 5); }); From c5eb78edd7dbd4ccb4c9397a9caca290d427628a Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 12 Aug 2021 16:12:04 +0530 Subject: [PATCH 107/306] refactor: Simplify validations, fix test_send --- frappe/email/doctype/newsletter/newsletter.py | 57 +++++++++++-------- 1 file changed, 34 insertions(+), 23 deletions(-) diff --git a/frappe/email/doctype/newsletter/newsletter.py b/frappe/email/doctype/newsletter/newsletter.py index 1ad0538036..c575cc9ce0 100755 --- a/frappe/email/doctype/newsletter/newsletter.py +++ b/frappe/email/doctype/newsletter/newsletter.py @@ -1,5 +1,5 @@ -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors -# License: GNU General Public License v3. See license.txt +# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors +# MIT License. See LICENSE from typing import Dict, List @@ -11,6 +11,8 @@ from frappe.website.website_generator import WebsiteGenerator from frappe.utils.verified_command import get_signed_params, verify_request from frappe.email.doctype.email_group.email_group import add_subscribers +from .exceptions import NewsletterAlreadySentError, NoRecipientFoundError, NewsletterNotSavedError + class Newsletter(WebsiteGenerator): def onload(self): @@ -30,17 +32,14 @@ class Newsletter(WebsiteGenerator): @frappe.whitelist() def test_send(self): test_emails = frappe.utils.split_emails(self.test_email_id) - self.queue_all(test_email=test_emails) + self.queue_all(test_emails=test_emails) frappe.msgprint(_("Test email sent to {0}").format(self.test_email_id)) @frappe.whitelist() def send_emails(self): """send emails to leads and customers""" - if self.email_sent: - frappe.throw(_("Newsletter has already been sent")) - - if not self.newsletter_recipients: - frappe.throw(_("Newsletter should have atleast one recipient")) + self.validate_newsletter_status() + self.validate_newsletter_recipients() self.queue_all() frappe.msgprint(_("Email queued to {0} recipients").format(len(self.newsletter_recipients))) @@ -53,10 +52,29 @@ class Newsletter(WebsiteGenerator): filters={"reference_doctype": self.doctype, "reference_name": self.name}, fields=["status", "count(name)"], group_by="status", + order_by="status", as_list=True, ) self.get("__onload").status_count = dict(status_count) + def validate_send(self): + """Validate if Newsletter can be sent. + """ + self.validate_newsletter_status() + self.validate_newsletter_recipients() + + def validate_newsletter_status(self): + if self.email_sent: + frappe.throw(_("Newsletter has already been sent"), exc=NewsletterAlreadySentError) + + if self.get("__islocal"): + frappe.throw(_("Please save the Newsletter before sending"), exc=NewsletterNotSavedError) + + def validate_newsletter_recipients(self): + if not self.newsletter_recipients: + frappe.throw(_("Newsletter should have atleast one recipient"), exc=NoRecipientFoundError) + self.validate_recipient_address() + def validate_sender_address(self): """Validate self.send_from is a valid email address or not. """ @@ -69,15 +87,6 @@ class Newsletter(WebsiteGenerator): for recipient in self.newsletter_recipients: frappe.utils.validate_email_address(recipient, throw=True) - def validate_send(self): - """Validate if Newsletter can be sent. - """ - if self.get("__islocal"): - frappe.throw(_("Please save the Newsletter before sending")) - - if not self.newsletter_recipients: - frappe.throw(_("Newsletter should have at least one recipient")) - def get_linked_email_queue(self) -> List[str]: """Get list of email queue linked to this newsletter. """ @@ -110,23 +119,25 @@ class Newsletter(WebsiteGenerator): x for x in self.newsletter_recipients if x not in self.get_success_recipients() ] - def queue_all(self, test_email: str = None): + def queue_all(self, test_emails: List[str] = None): """Queue Newsletter to all the recipients generated from the `Email Group` table Args: - test_email (str, optional): Send test Newsletter to set email. Defaults to None. + test_email (List[str], optional): Send test Newsletter to the passed set of emails. + Defaults to None. """ - if test_email: - frappe.utils.validate_email_address(test_email, throw=True) + if test_emails: + for test_email in test_emails: + frappe.utils.validate_email_address(test_email, throw=True) else: self.validate() self.validate_send() - newsletter_recipients = test_email or self.get_pending_recipients() + newsletter_recipients = test_emails or self.get_pending_recipients() self.send_newsletter(emails=newsletter_recipients) - if not test_email: + if not test_emails: self.email_sent = True self.schedule_send = frappe.utils.now_datetime() self.scheduled_to_send = len(newsletter_recipients) From a5010af92a022fcea6dcee1efa35e1a5d8020d12 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 12 Aug 2021 16:12:55 +0530 Subject: [PATCH 108/306] test: Update tests for Newsletter Added tests for better coverage: Increased to 77% ~ near complete coverage of controller class, missing tests for API endpoints --- .../doctype/newsletter/test_newsletter.py | 179 ++++++++++++++---- 1 file changed, 147 insertions(+), 32 deletions(-) diff --git a/frappe/email/doctype/newsletter/test_newsletter.py b/frappe/email/doctype/newsletter/test_newsletter.py index c1f6c7d4a9..2d5b8864f1 100644 --- a/frappe/email/doctype/newsletter/test_newsletter.py +++ b/frappe/email/doctype/newsletter/test_newsletter.py @@ -1,17 +1,26 @@ -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors -# License: GNU General Public License v3. See license.txt +# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors +# MIT License. See LICENSE + import unittest from random import choice +from typing import Union +from unittest.mock import MagicMock, PropertyMock, patch import frappe +from frappe.desk.form.load import run_onload +from frappe.email.doctype.newsletter.exceptions import ( + NewsletterAlreadySentError, NoRecipientFoundError +) from frappe.email.doctype.newsletter.newsletter import ( + Newsletter, confirmed_unsubscribe, - send_scheduled_email, + get_newsletter_list, + send_scheduled_email ) -from frappe.email.doctype.newsletter.newsletter import get_newsletter_list from frappe.email.queue import flush from frappe.utils import add_days, getdate + test_dependencies = ["Email Group"] emails = [ "test_subscriber1@example.com", @@ -20,14 +29,33 @@ emails = [ "test1@example.com", ] +def get_dotted_path(obj: type) -> str: + klass = obj.__class__ + module = klass.__module__ + if module == 'builtins': + return klass.__qualname__ # avoid outputs like 'builtins.str' + return f"{module}.{klass.__qualname__}" + + +class TestNewsletterMixin: + @classmethod + def setUpclass(self): + frappe.db.delete("Newsletter") -class TestNewsletter(unittest.TestCase): def setUp(self): frappe.set_user("Administrator") frappe.db.delete("Email Group Member") + self.setup_email_group() + + def tearDown(self): + frappe.db.delete("Newsletter") + def setup_email_group(self): if not frappe.db.exists("Email Group", "_Test Email Group"): - frappe.get_doc({"doctype": "Email Group", "title": "_Test Email Group"}).insert() + frappe.get_doc({ + "doctype": "Email Group", + "title": "_Test Email Group" + }).insert() for email in emails: frappe.get_doc({ @@ -36,6 +64,54 @@ class TestNewsletter(unittest.TestCase): "email_group": "_Test Email Group" }).insert() + def send_newsletter(self, published=0, schedule_send=None) -> Union[str, None]: + frappe.db.delete("Email Queue") + frappe.db.delete("Email Queue Recipient") + frappe.db.delete("Newsletter") + newsletter_options = { + "published": published, + "schedule_sending": bool(schedule_send), + "schedule_send": schedule_send + } + newsletter = self.get_newsletter(**newsletter_options) + + if schedule_send: + send_scheduled_email() + else: + newsletter.send_emails() + return newsletter.name + + @staticmethod + def get_newsletter(**kwargs) -> "Newsletter": + """Generate and return Newsletter object + """ + newsletter_content = { + "doctype": "Newsletter", + "subject": "_Test Newsletter", + "send_from": "Test Sender ", + "content_type": "Rich Text", + "message": "Testing my news.", + } + newsletter = frappe.get_doc({**newsletter_content, **kwargs}) + newsletter.append("email_group", {"email_group": "_Test Email Group"}) + + newsletter.insert(ignore_permissions=True) + newsletter.save() + newsletter.reload() + + attached_files = frappe.get_all("File", { + "attached_to_doctype": newsletter.doctype, + "attached_to_name": newsletter.name, + }, + pluck="name", + ) + for file in attached_files: + frappe.delete_doc("File", file) + + return newsletter + + +class TestNewsletter(TestNewsletterMixin, unittest.TestCase): def test_send(self): self.send_newsletter() @@ -64,32 +140,6 @@ class TestNewsletter(unittest.TestCase): if email != to_unsubscribe: self.assertTrue(email in recipients) - @staticmethod - def send_newsletter(published=0, schedule_send=None): - frappe.db.delete("Email Queue") - frappe.db.delete("Email Queue Recipient") - frappe.db.delete("Newsletter") - - newsletter = frappe.get_doc({ - "doctype": "Newsletter", - "subject": "_Test Newsletter", - "send_from": "Test Sender ", - "content_type": "Rich Text", - "message": "Testing my news.", - "published": published, - "schedule_sending": bool(schedule_send), - "schedule_send": schedule_send - }) - newsletter.insert(ignore_permissions=True) - newsletter.append("email_group", {"email_group": "_Test Email Group"}) - newsletter.save() - - if schedule_send: - send_scheduled_email() - else: - newsletter.send_emails() - return newsletter.name - def test_portal(self): self.send_newsletter(published=1) frappe.set_user("test1@example.com") @@ -113,3 +163,68 @@ class TestNewsletter(unittest.TestCase): recipients = [e.recipients[0].recipient for e in email_queue_list] for email in emails: self.assertTrue(email in recipients) + + def test_newsletter_test_send(self): + """Test "Test Send" functionality of Newsletter + """ + newsletter = self.get_newsletter() + newsletter.test_email_id = choice(emails) + newsletter.test_send() + + self.assertFalse(newsletter.email_sent) + newsletter.save = MagicMock() + self.assertFalse(newsletter.save.called) + + def test_newsletter_status(self): + """Test for Newsletter's stats on onload event + """ + newsletter = self.get_newsletter() + newsletter.email_sent = True + # had to use run_onload as calling .onload directly bought weird errors + # like TestNewsletter has no attribute "_TestNewsletter__onload" + run_onload(newsletter) + self.assertIsInstance(newsletter.get("__onload").status_count, dict) + + def test_already_sent_newsletter(self): + newsletter = self.get_newsletter() + newsletter.send_emails() + + with self.assertRaises(NewsletterAlreadySentError): + newsletter.send_emails() + + def test_newsletter_with_no_recipient(self): + newsletter = self.get_newsletter() + property_path = f"{get_dotted_path(newsletter)}.newsletter_recipients" + + with patch(property_path, new_callable=PropertyMock) as mock_newsletter_recipients: + mock_newsletter_recipients.return_value = [] + with self.assertRaises(NoRecipientFoundError): + newsletter.send_emails() + + def test_send_newsletter_with_attachments(self): + newsletter = self.get_newsletter() + newsletter.reload() + file_attachment = frappe.get_doc({ + "doctype": "File", + "file_name": "test1.txt", + "attached_to_doctype": newsletter.doctype, + "attached_to_name": newsletter.name, + "content": frappe.mock("paragraph") + }) + file_attachment.save() + newsletter.send_attachments = True + newsletter_attachments = newsletter.get_newsletter_attachments() + self.assertEqual(len(newsletter_attachments), 1) + self.assertEqual(newsletter_attachments[0]["fid"], file_attachment.name) + + def test_send_scheduled_email_error_handling(self): + newsletter = self.get_newsletter(schedule_send=add_days(getdate(), -1)) + job_path = "frappe.email.doctype.newsletter.newsletter.Newsletter.queue_all" + m = MagicMock(side_effect=frappe.OutgoingEmailError) + + with self.assertRaises(frappe.OutgoingEmailError): + with patch(job_path, new_callable=m): + send_scheduled_email() + + newsletter.reload() + self.assertEqual(newsletter.email_sent, 0) From d5739cd43bb7b2cbc566158bedb4f080ae965f6f Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 12 Aug 2021 16:46:09 +0530 Subject: [PATCH 109/306] fix: Add exceptions classes for Newsletter --- frappe/email/doctype/newsletter/exceptions.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 frappe/email/doctype/newsletter/exceptions.py diff --git a/frappe/email/doctype/newsletter/exceptions.py b/frappe/email/doctype/newsletter/exceptions.py new file mode 100644 index 0000000000..a6c688dbe8 --- /dev/null +++ b/frappe/email/doctype/newsletter/exceptions.py @@ -0,0 +1,13 @@ +# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors +# MIT License. See LICENSE + +from frappe.exceptions import ValidationError + +class NewsletterAlreadySentError(ValidationError): + pass + +class NoRecipientFoundError(ValidationError): + pass + +class NewsletterNotSavedError(ValidationError): + pass From 43b9b452ff34b6318e967b01d4374d2ee2542211 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 12 Aug 2021 17:30:23 +0530 Subject: [PATCH 110/306] fix: Don't clear Newsletter table at setupClass --- frappe/email/doctype/newsletter/test_newsletter.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/frappe/email/doctype/newsletter/test_newsletter.py b/frappe/email/doctype/newsletter/test_newsletter.py index 2d5b8864f1..8662b6d726 100644 --- a/frappe/email/doctype/newsletter/test_newsletter.py +++ b/frappe/email/doctype/newsletter/test_newsletter.py @@ -38,10 +38,6 @@ def get_dotted_path(obj: type) -> str: class TestNewsletterMixin: - @classmethod - def setUpclass(self): - frappe.db.delete("Newsletter") - def setUp(self): frappe.set_user("Administrator") frappe.db.delete("Email Group Member") From e4e79dd4246739066b67c5a19b2479660c52496c Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 12 Aug 2021 17:41:53 +0530 Subject: [PATCH 111/306] test: minor fix --- cypress/integration/workspace.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cypress/integration/workspace.js b/cypress/integration/workspace.js index 2c3a8434ee..0021c7117f 100644 --- a/cypress/integration/workspace.js +++ b/cypress/integration/workspace.js @@ -24,13 +24,14 @@ context('Workspace 2.0', () => { cy.get('.standard-actions .btn-primary[data-label="Save Customizations"]').click(); cy.wait(300); cy.get('.sidebar-item-container[item-name="Test Private Page"]').should('have.attr', 'item-public', '0'); - }); - it('Add New Block', () => { cy.wait(500); cy.get('.codex-editor__redactor .ce-block'); cy.get('.standard-actions .btn-secondary[data-label=Customize]').click(); + }); + it('Add New Block', () => { + cy.get('.codex-editor__redactor .ce-block'); cy.get('.custom-actions .inner-group-button[data-label="Add%20Block"]').click(); cy.get('.custom-actions .inner-group-button .dropdown-menu .block-menu-item-label').contains('Heading').click(); cy.get(".ce-block:last").find('h2').type('Header'); From 189f9f81ae454842de9bc3bb36beb06c50b0ecd6 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 12 Aug 2021 17:47:38 +0530 Subject: [PATCH 112/306] fix(Newsletter): Remove "double" validations Validations for checking recipients and statuses were being checked again later on, via validate_send. This gets rid of doing it twice --- frappe/email/doctype/newsletter/newsletter.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/frappe/email/doctype/newsletter/newsletter.py b/frappe/email/doctype/newsletter/newsletter.py index c575cc9ce0..b08964c006 100755 --- a/frappe/email/doctype/newsletter/newsletter.py +++ b/frappe/email/doctype/newsletter/newsletter.py @@ -38,9 +38,6 @@ class Newsletter(WebsiteGenerator): @frappe.whitelist() def send_emails(self): """send emails to leads and customers""" - self.validate_newsletter_status() - self.validate_newsletter_recipients() - self.queue_all() frappe.msgprint(_("Email queued to {0} recipients").format(len(self.newsletter_recipients))) From 0ada55120738fbf1ebaafaf3fe050f8eccb299b6 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 12 Aug 2021 19:52:28 +0530 Subject: [PATCH 113/306] fix: Removed build.json, changed patch to v14 --- frappe/patches.txt | 2 +- .../{v13_0 => v14_0}/update_workspace2.py | 0 frappe/public/build.json | 300 ------------------ .../js/frappe/views/workspace/workspace.js | 12 +- 4 files changed, 7 insertions(+), 307 deletions(-) rename frappe/patches/{v13_0 => v14_0}/update_workspace2.py (100%) delete mode 100755 frappe/public/build.json diff --git a/frappe/patches.txt b/frappe/patches.txt index d7cd697717..87919b0247 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -180,6 +180,6 @@ frappe.patches.v12_0.rename_uploaded_files_with_proper_name frappe.patches.v13_0.queryreport_columns frappe.patches.v13_0.jinja_hook frappe.patches.v13_0.update_notification_channel_if_empty -frappe.patches.v13_0.update_workspace2 frappe.patches.v14_0.drop_data_import_legacy frappe.patches.v14_0.rename_cancelled_documents +frappe.patches.v14_0.update_workspace2 diff --git a/frappe/patches/v13_0/update_workspace2.py b/frappe/patches/v14_0/update_workspace2.py similarity index 100% rename from frappe/patches/v13_0/update_workspace2.py rename to frappe/patches/v14_0/update_workspace2.py diff --git a/frappe/public/build.json b/frappe/public/build.json deleted file mode 100755 index ccdb895366..0000000000 --- a/frappe/public/build.json +++ /dev/null @@ -1,300 +0,0 @@ -{ - "css/frappe-web-b4.css": "public/scss/website.scss", - "css/frappe-chat-web.css": [ - "public/css/font-awesome.css", - "public/css/octicons/octicons.css", - "public/less/chat.less" - ], - "concat:js/moment-bundle.min.js": [ - "node_modules/moment/min/moment-with-locales.min.js", - "node_modules/moment-timezone/builds/moment-timezone-with-data.min.js" - ], - "js/chat.js": "public/js/frappe/chat.js", - "js/frappe-recorder.min.js": "public/js/frappe/recorder/recorder.js", - "js/checkout.min.js": "public/js/integrations/razorpay.js", - "js/frappe-web.min.js": [ - "public/js/frappe/class.js", - "public/js/frappe/polyfill.js", - "public/js/lib/md5.min.js", - "public/js/frappe/provide.js", - "public/js/frappe/format.js", - "public/js/frappe/utils/number_format.js", - "public/js/frappe/utils/utils.js", - "public/js/frappe/utils/common.js", - "public/js/frappe/ui/messages.js", - "public/js/frappe/translate.js", - "public/js/frappe/utils/pretty_date.js", - "public/js/frappe/microtemplate.js", - "public/js/frappe/query_string.js", - - "public/js/frappe/upload.js", - - "public/js/frappe/model/meta.js", - "public/js/frappe/model/model.js", - "public/js/frappe/model/perm.js", - - "website/js/website.js", - "public/js/frappe/socketio_client.js" - ], - "js/bootstrap-4-web.min.js": "website/js/bootstrap-4.js", - "js/control.min.js": [ - "node_modules/air-datepicker/dist/js/datepicker.min.js", - "node_modules/air-datepicker/dist/js/i18n/datepicker.cs.js", - "node_modules/air-datepicker/dist/js/i18n/datepicker.da.js", - "node_modules/air-datepicker/dist/js/i18n/datepicker.de.js", - "node_modules/air-datepicker/dist/js/i18n/datepicker.en.js", - "node_modules/air-datepicker/dist/js/i18n/datepicker.es.js", - "node_modules/air-datepicker/dist/js/i18n/datepicker.fi.js", - "node_modules/air-datepicker/dist/js/i18n/datepicker.fr.js", - "node_modules/air-datepicker/dist/js/i18n/datepicker.hu.js", - "node_modules/air-datepicker/dist/js/i18n/datepicker.nl.js", - "node_modules/air-datepicker/dist/js/i18n/datepicker.pl.js", - "node_modules/air-datepicker/dist/js/i18n/datepicker.pt-BR.js", - "node_modules/air-datepicker/dist/js/i18n/datepicker.pt.js", - "node_modules/air-datepicker/dist/js/i18n/datepicker.ro.js", - "node_modules/air-datepicker/dist/js/i18n/datepicker.sk.js", - "node_modules/air-datepicker/dist/js/i18n/datepicker.zh.js", - "public/js/frappe/ui/capture.js", - "public/js/frappe/form/controls/control.js" - ], - "js/dialog.min.js": [ - "public/js/frappe/dom.js", - "public/js/frappe/form/formatters.js", - "public/js/frappe/form/layout.js", - "public/js/frappe/ui/field_group.js", - "public/js/frappe/form/link_selector.js", - "public/js/frappe/form/multi_select_dialog.js", - "public/js/frappe/ui/dialog.js" - ], - "css/desk.min.css": [ - "public/js/lib/leaflet/leaflet.css", - "public/js/lib/leaflet/leaflet.draw.css", - "public/js/lib/leaflet/L.Control.Locate.css", - "public/js/lib/leaflet/easy-button.css", - "public/css/font-awesome.css", - "public/css/octicons/octicons.css", - "public/less/desk.less", - "public/less/module.less", - "public/less/mobile.less", - "public/less/controls.less", - "public/less/chat.less", - "public/css/fonts/inter/inter.css", - "node_modules/frappe-charts/dist/frappe-charts.min.css", - "node_modules/plyr/dist/plyr.css", - "public/scss/desk.scss" - ], - "css/frappe-rtl.css": [ - "public/css/bootstrap-rtl.css", - "public/css/desk-rtl.css", - "public/css/report-rtl.css" - ], - "css/printview.css": [ - "public/css/bootstrap.css", - "public/scss/print.scss" - ], - "concat:js/libs.min.js": [ - "public/js/lib/Sortable.min.js", - "public/js/lib/jquery/jquery.hotkeys.js", - "node_modules/bootstrap/dist/js/bootstrap.bundle.min.js", - "node_modules/vue/dist/vue.min.js", - "node_modules/moment/min/moment-with-locales.min.js", - "node_modules/moment-timezone/builds/moment-timezone-with-data.min.js", - "node_modules/socket.io-client/dist/socket.io.slim.js", - "node_modules/localforage/dist/localforage.min.js", - "public/js/lib/jSignature.min.js", - "public/js/lib/leaflet/leaflet.js", - "public/js/lib/leaflet/leaflet.draw.js", - "public/js/lib/leaflet/L.Control.Locate.js", - "public/js/lib/leaflet/easy-button.js" - ], - "js/desk.min.js": [ - "public/js/frappe/translate.js", - "public/js/frappe/class.js", - "public/js/frappe/polyfill.js", - "public/js/frappe/provide.js", - "public/js/frappe/assets.js", - "public/js/frappe/format.js", - "public/js/frappe/form/formatters.js", - "public/js/frappe/dom.js", - "public/js/frappe/ui/messages.js", - "public/js/frappe/ui/keyboard.js", - "public/js/frappe/ui/colors.js", - "public/js/frappe/ui/sidebar.js", - "public/js/frappe/ui/link_preview.js", - - "public/js/frappe/request.js", - "public/js/frappe/socketio_client.js", - "public/js/frappe/utils/utils.js", - "public/js/frappe/event_emitter.js", - "public/js/frappe/router.js", - "public/js/frappe/router_history.js", - "public/js/frappe/defaults.js", - "public/js/frappe/roles_editor.js", - "public/js/frappe/module_editor.js", - "public/js/frappe/microtemplate.js", - - "public/js/frappe/ui/page.html", - "public/js/frappe/ui/page.js", - "public/js/frappe/ui/slides.js", - "public/js/frappe/ui/onboarding_dialog.js", - "public/js/frappe/ui/find.js", - "public/js/frappe/ui/iconbar.js", - "public/js/frappe/form/layout.js", - "public/js/frappe/ui/field_group.js", - "public/js/frappe/form/link_selector.js", - "public/js/frappe/form/multi_select_dialog.js", - "public/js/frappe/ui/dialog.js", - "public/js/frappe/ui/capture.js", - "public/js/frappe/ui/app_icon.js", - "public/js/frappe/ui/theme_switcher.js", - - "public/js/frappe/model/model.js", - "public/js/frappe/db.js", - "public/js/frappe/model/meta.js", - "public/js/frappe/model/sync.js", - "public/js/frappe/model/create_new.js", - "public/js/frappe/model/perm.js", - "public/js/frappe/model/workflow.js", - "public/js/frappe/model/user_settings.js", - - "public/js/lib/md5.min.js", - "public/js/frappe/utils/user.js", - "public/js/frappe/utils/common.js", - "public/js/frappe/utils/urllib.js", - "public/js/frappe/utils/pretty_date.js", - "public/js/frappe/utils/tools.js", - "public/js/frappe/utils/datetime.js", - "public/js/frappe/utils/number_format.js", - "public/js/frappe/utils/help.js", - "public/js/frappe/utils/help_links.js", - "public/js/frappe/utils/address_and_contact.js", - "public/js/frappe/utils/preview_email.js", - "public/js/frappe/utils/file_manager.js", - - "public/js/frappe/upload.js", - "public/js/frappe/ui/tree.js", - - "public/js/frappe/views/container.js", - "public/js/frappe/views/breadcrumbs.js", - "public/js/frappe/views/factory.js", - "public/js/frappe/views/pageview.js", - - "public/js/frappe/ui/toolbar/awesome_bar.js", - "public/js/frappe/ui/toolbar/energy_points_notifications.js", - "public/js/frappe/ui/notifications/notifications.js", - "public/js/frappe/ui/toolbar/search.js", - "public/js/frappe/ui/toolbar/tag_utils.js", - "public/js/frappe/ui/toolbar/search.html", - "public/js/frappe/ui/toolbar/search_utils.js", - "public/js/frappe/ui/toolbar/about.js", - "public/js/frappe/ui/toolbar/navbar.html", - "public/js/frappe/ui/toolbar/toolbar.js", - "public/js/frappe/ui/toolbar/notifications.js", - "public/js/frappe/views/communication.js", - "public/js/frappe/views/translation_manager.js", - "public/js/frappe/views/workspace/workspace.js", - "public/js/frappe/views/workspace/blocks/index.js", - - "public/js/frappe/widgets/widget_group.js", - - "public/js/frappe/ui/sort_selector.html", - "public/js/frappe/ui/sort_selector.js", - - "public/js/frappe/change_log.html", - "public/js/frappe/ui/workspace_loading_skeleton.html", - "public/js/frappe/desk.js", - "public/js/frappe/query_string.js", - - "public/js/frappe/ui/comment.js", - - "public/js/frappe/chat.js", - "public/js/frappe/utils/energy_point_utils.js", - "public/js/frappe/utils/dashboard_utils.js", - "public/js/frappe/ui/chart.js", - "public/js/frappe/ui/datatable.js", - "public/js/frappe/ui/driver.js", - "public/js/frappe/ui/plyr.js", - "public/js/frappe/barcode_scanner/index.js" - ], - "js/form.min.js": [ - "public/js/frappe/form/templates/**.html", - "public/js/frappe/form/controls/control.js", - "public/js/frappe/views/formview.js", - "public/js/frappe/form/form.js", - "public/js/frappe/meta_tag.js" - ], - "js/list.min.js": [ - "public/js/frappe/ui/listing.html", - - "public/js/frappe/model/indicator.js", - "public/js/frappe/ui/filters/filter.js", - "public/js/frappe/ui/filters/filter_list.js", - "public/js/frappe/ui/filters/field_select.js", - "public/js/frappe/ui/filters/edit_filter.html", - "public/js/frappe/ui/tags.js", - "public/js/frappe/ui/tag_editor.js", - "public/js/frappe/ui/like.js", - "public/js/frappe/ui/liked_by.html", - "public/html/print_template.html", - - "public/js/frappe/list/base_list.js", - "public/js/frappe/list/list_view.js", - "public/js/frappe/list/list_factory.js", - - "public/js/frappe/list/list_view_select.js", - "public/js/frappe/list/list_sidebar.js", - "public/js/frappe/list/list_sidebar.html", - "public/js/frappe/list/list_sidebar_stat.html", - "public/js/frappe/list/list_sidebar_group_by.js", - "public/js/frappe/list/list_view_permission_restrictions.html", - - "public/js/frappe/views/gantt/gantt_view.js", - "public/js/frappe/views/calendar/calendar.js", - "public/js/frappe/views/dashboard/dashboard_view.js", - "public/js/frappe/views/image/image_view.js", - "public/js/frappe/views/map/map_view.js", - "public/js/frappe/views/kanban/kanban_view.js", - "public/js/frappe/views/inbox/inbox_view.js", - "public/js/frappe/views/file/file_view.js", - - "public/js/frappe/views/treeview.js", - "public/js/frappe/views/interaction.js", - - "public/js/frappe/views/image/image_view_item_row.html", - "public/js/frappe/views/image/photoswipe_dom.html", - - "public/js/frappe/views/kanban/kanban_board.html", - "public/js/frappe/views/kanban/kanban_column.html", - "public/js/frappe/views/kanban/kanban_card.html" - ], - "css/report.min.css": [ - "node_modules/frappe-datatable/dist/frappe-datatable.css", - "public/css/tree_grid.css" - ], - "js/report.min.js": [ - "public/js/lib/clusterize.min.js", - "public/js/frappe/views/reports/report_factory.js", - "public/js/frappe/views/reports/report_view.js", - "public/js/frappe/views/reports/query_report.js", - "public/js/frappe/views/reports/print_grid.html", - "public/js/frappe/views/reports/print_tree.html", - "public/js/frappe/ui/group_by/group_by.html", - "public/js/frappe/ui/group_by/group_by.js", - "public/js/frappe/views/reports/report_utils.js" - ], - "js/web_form.min.js": [ - "public/js/frappe/utils/datetime.js", - "public/js/frappe/web_form/webform_script.js" - ], - "css/web_form.css": [ - "website/css/web_form.css", - "public/css/octicons/octicons.css", - "public/scss/controls.scss", - "node_modules/frappe-datatable/dist/frappe-datatable.css" - ], - "css/email.css": "public/scss/email.scss", - "js/barcode_scanner.min.js": "public/js/frappe/barcode_scanner/quagga.js", - "js/user_profile_controller.min.js": "desk/page/user_profile/user_profile_controller.js", - "css/login.css": "public/scss/login.scss", - "js/data_import_tools.min.js": "public/js/frappe/data_import/index.js" -} diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index 41bd278e57..b46c220d9d 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -21,7 +21,7 @@ frappe.views.Workspace = class Workspace { this.wrapper = $(wrapper); this.page = wrapper.page; this.blocks = frappe.wspace_block.blocks; - this.isReadOnly = true; + this.is_read_only = true; this.new_page = null; this.sorted_public_items = []; this.sorted_private_items = []; @@ -356,7 +356,7 @@ frappe.views.Workspace = class Workspace { let pages = page.public ? this.public_pages : this.private_pages; let current_page = pages.filter(p => p.title == page.name)[0]; - if (!this.isReadOnly) { + if (!this.is_read_only) { this.setup_customization_buttons(current_page.is_editable); return; } @@ -367,7 +367,7 @@ frappe.views.Workspace = class Workspace { current_page.is_editable && this.page.set_secondary_action(__("Customize"), () => { if (!this.editor || !this.editor.readOnly) return; - this.isReadOnly = false; + this.is_read_only = false; this.editor.readOnly.toggle(); this.editor.isReady.then(() => { this.initialize_editorjs_undo(); @@ -404,7 +404,7 @@ frappe.views.Workspace = class Workspace { this.undo.readOnly = true; this.save_page(); this.editor.readOnly.toggle(); - this.isReadOnly = true; + this.is_read_only = true; }, null, __("Saving") @@ -417,7 +417,7 @@ frappe.views.Workspace = class Workspace { this.page.clear_secondary_action(); this.page.clear_inner_toolbar(); this.editor.readOnly.toggle(); - this.isReadOnly = true; + this.is_read_only = true; this.deleted_sidebar_items = []; this.reload(); frappe.show_alert({ message: __("Customizations Discarded"), indicator: "info" }); @@ -595,7 +595,7 @@ frappe.views.Workspace = class Workspace { ] }).then(() => { if (this.editor.configuration.readOnly) { - this.isReadOnly = false; + this.is_read_only = false; this.editor.readOnly.toggle(); } this.add_page_to_sidebar(values); From d3e7f0ac36148289ee2df5ee81c43bd6fb8457bd Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 12 Aug 2021 20:30:15 +0530 Subject: [PATCH 114/306] test: minor fix --- cypress/integration/workspace.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cypress/integration/workspace.js b/cypress/integration/workspace.js index 0021c7117f..d1ca3d8cd1 100644 --- a/cypress/integration/workspace.js +++ b/cypress/integration/workspace.js @@ -1,10 +1,12 @@ context('Workspace 2.0', () => { before(() => { + cy.visit('/login'); cy.login(); cy.visit('/app/website'); }); it('Navigate to page from sidebar', () => { + cy.visit('/app/build'); cy.get('.codex-editor__redactor .ce-block'); cy.get('.sidebar-item-container[item-name="Settings"]').first().click(); cy.location('pathname').should('eq', '/app/settings'); From bdad9e8751e2d8c75ae66a419a387b9a09916a78 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 12 Aug 2021 21:02:32 +0530 Subject: [PATCH 115/306] test: focus and type error fix --- cypress/integration/workspace.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cypress/integration/workspace.js b/cypress/integration/workspace.js index d1ca3d8cd1..9701e54c5e 100644 --- a/cypress/integration/workspace.js +++ b/cypress/integration/workspace.js @@ -36,12 +36,12 @@ context('Workspace 2.0', () => { cy.get('.codex-editor__redactor .ce-block'); cy.get('.custom-actions .inner-group-button[data-label="Add%20Block"]').click(); cy.get('.custom-actions .inner-group-button .dropdown-menu .block-menu-item-label').contains('Heading').click(); - cy.get(".ce-block:last").find('h2').type('Header'); + cy.get(".ce-block:last").find('h2').click({force: true}).type('Header'); cy.get(".ce-block:last").find('.ce-header').should('exist'); cy.get('.custom-actions .inner-group-button[data-label="Add%20Block"]').click(); cy.get('.custom-actions .inner-group-button .dropdown-menu .block-menu-item-label').contains('Text').click(); - cy.get(".ce-block:last").find('.ce-paragraph').type('Paragraph text'); + cy.get(".ce-block:last").find('.ce-paragraph').click({force: true}).type('Paragraph text'); cy.get(".ce-block:last").find('.ce-paragraph').should('exist'); }); From 4598b26c73814ec7170d533f637ce60f84ee091d Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Sat, 31 Jul 2021 13:24:18 +0530 Subject: [PATCH 116/306] fix: multiple issues with Email Inbox --- frappe/public/js/frappe/ui/toolbar/awesome_bar.js | 7 ++++++- frappe/public/js/frappe/views/inbox/inbox_view.js | 11 ++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/frappe/public/js/frappe/ui/toolbar/awesome_bar.js b/frappe/public/js/frappe/ui/toolbar/awesome_bar.js index b85de18be2..952fd62aa1 100644 --- a/frappe/public/js/frappe/ui/toolbar/awesome_bar.js +++ b/frappe/public/js/frappe/ui/toolbar/awesome_bar.js @@ -194,9 +194,14 @@ frappe.search.AwesomeBar = class AwesomeBar { var out = [], routes = []; options.forEach(function(option) { if(option.route) { - if(option.route[0] === "List" && option.route[2] !== 'Report') { + if ( + option.route[0] === "List" && + option.route[2] !== 'Report' && + option.route[2] !== 'Inbox' + ) { option.route.splice(2); } + var str_route = (typeof option.route==='string') ? option.route : option.route.join('/'); if(routes.indexOf(str_route)===-1) { diff --git a/frappe/public/js/frappe/views/inbox/inbox_view.js b/frappe/public/js/frappe/views/inbox/inbox_view.js index 8b53bd49a9..6c5b330a9f 100644 --- a/frappe/public/js/frappe/views/inbox/inbox_view.js +++ b/frappe/public/js/frappe/views/inbox/inbox_view.js @@ -94,19 +94,20 @@ frappe.views.InboxView = class InboxView extends frappe.views.ListView { this.render_list(); this.on_row_checked(); this.render_count(); - this.render_tags(); } get_meta_html(email) { const attachment = email.has_attachment ? `` : ''; - const form_link = frappe.utils.get_form_link(email.reference_doctype, email.reference_name); - const link = email.reference_doctype && email.reference_doctype !== this.doctype ? - ` - ` : ''; + `; + } const communication_date = comment_when(email.communication_date, true); const status = From cefa75c8dc06d7f0604b1ed874d1963a9f0c9ae9 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 13 Aug 2021 12:44:25 +0530 Subject: [PATCH 117/306] test: Setup email group at the start of testcase --- frappe/email/doctype/newsletter/test_newsletter.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/frappe/email/doctype/newsletter/test_newsletter.py b/frappe/email/doctype/newsletter/test_newsletter.py index 8662b6d726..f67b99bd94 100644 --- a/frappe/email/doctype/newsletter/test_newsletter.py +++ b/frappe/email/doctype/newsletter/test_newsletter.py @@ -38,10 +38,12 @@ def get_dotted_path(obj: type) -> str: class TestNewsletterMixin: + @classmethod + def setUpClass(cls): + cls.setup_email_group() + def setUp(self): frappe.set_user("Administrator") - frappe.db.delete("Email Group Member") - self.setup_email_group() def tearDown(self): frappe.db.delete("Newsletter") From f2641c37f2c910ca317751411d6a87357975eb11 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 13 Aug 2021 13:02:58 +0530 Subject: [PATCH 118/306] test: Delete newsletters and email docs created in test --- .../email/doctype/newsletter/test_newsletter.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/frappe/email/doctype/newsletter/test_newsletter.py b/frappe/email/doctype/newsletter/test_newsletter.py index f67b99bd94..961d4d3377 100644 --- a/frappe/email/doctype/newsletter/test_newsletter.py +++ b/frappe/email/doctype/newsletter/test_newsletter.py @@ -28,6 +28,8 @@ emails = [ "test_subscriber3@example.com", "test1@example.com", ] +newsletters = [] + def get_dotted_path(obj: type) -> str: klass = obj.__class__ @@ -46,7 +48,14 @@ class TestNewsletterMixin: frappe.set_user("Administrator") def tearDown(self): - frappe.db.delete("Newsletter") + frappe.set_user("Administrator") + for newsletter in newsletters: + frappe.db.delete("Email Queue", { + "reference_doctype": "Newsletter", + "reference_name": newsletter, + }) + frappe.delete_doc("Newsletter", newsletter) + newsletters.remove(newsletter) def setup_email_group(self): if not frappe.db.exists("Email Group", "_Test Email Group"): @@ -63,9 +72,6 @@ class TestNewsletterMixin: }).insert() def send_newsletter(self, published=0, schedule_send=None) -> Union[str, None]: - frappe.db.delete("Email Queue") - frappe.db.delete("Email Queue Recipient") - frappe.db.delete("Newsletter") newsletter_options = { "published": published, "schedule_sending": bool(schedule_send), @@ -96,6 +102,7 @@ class TestNewsletterMixin: newsletter.insert(ignore_permissions=True) newsletter.save() newsletter.reload() + newsletters.add(newsletter.name) attached_files = frappe.get_all("File", { "attached_to_doctype": newsletter.doctype, From 6feae59b20a739602d408c15a874b5cbb5f0de81 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 13 Aug 2021 17:23:01 +0530 Subject: [PATCH 119/306] fix: Hanlde Newsletter.get_email_groups & tests cleanup --- frappe/email/doctype/newsletter/newsletter.py | 8 +++- .../doctype/newsletter/test_newsletter.py | 42 ++++++++++++------- 2 files changed, 33 insertions(+), 17 deletions(-) diff --git a/frappe/email/doctype/newsletter/newsletter.py b/frappe/email/doctype/newsletter/newsletter.py index b08964c006..667d0fb34c 100755 --- a/frappe/email/doctype/newsletter/newsletter.py +++ b/frappe/email/doctype/newsletter/newsletter.py @@ -204,7 +204,10 @@ class Newsletter(WebsiteGenerator): return list(set(emails)) def get_email_groups(self) -> List[str]: - return frappe.db.get_all( + # wondering why the 'or'? i can't figure out why both aren't equivalent - @gavin + return [ + x.email_group for x in self.email_group + ] or frappe.get_all( "Newsletter Email Group", filters={"parent": self.name, "parenttype": "Newsletter"}, pluck="email_group", @@ -376,4 +379,5 @@ def send_scheduled_email(): ) frappe.log_error(title="Send Newsletter", message=message) - frappe.db.commit() + if not frappe.flags.in_test: + frappe.db.commit() diff --git a/frappe/email/doctype/newsletter/test_newsletter.py b/frappe/email/doctype/newsletter/test_newsletter.py index 961d4d3377..abbcc6440c 100644 --- a/frappe/email/doctype/newsletter/test_newsletter.py +++ b/frappe/email/doctype/newsletter/test_newsletter.py @@ -40,12 +40,9 @@ def get_dotted_path(obj: type) -> str: class TestNewsletterMixin: - @classmethod - def setUpClass(cls): - cls.setup_email_group() - def setUp(self): frappe.set_user("Administrator") + self.setup_email_group() def tearDown(self): frappe.set_user("Administrator") @@ -55,6 +52,7 @@ class TestNewsletterMixin: "reference_name": newsletter, }) frappe.delete_doc("Newsletter", newsletter) + frappe.db.delete("Newsletter Email Group", newsletter) newsletters.remove(newsletter) def setup_email_group(self): @@ -65,13 +63,24 @@ class TestNewsletterMixin: }).insert() for email in emails: - frappe.get_doc({ - "doctype": "Email Group Member", + doctype = "Email Group Member" + email_filters = { "email": email, "email_group": "_Test Email Group" - }).insert() + } + try: + frappe.get_doc({ + "doctype": doctype, + **email_filters, + }).insert() + except Exception: + frappe.db.update(doctype, email_filters, "unsubscribed", 0) def send_newsletter(self, published=0, schedule_send=None) -> Union[str, None]: + frappe.db.delete("Email Queue") + frappe.db.delete("Email Queue Recipient") + frappe.db.delete("Newsletter") + newsletter_options = { "published": published, "schedule_sending": bool(schedule_send), @@ -89,20 +98,23 @@ class TestNewsletterMixin: def get_newsletter(**kwargs) -> "Newsletter": """Generate and return Newsletter object """ + doctype = "Newsletter" newsletter_content = { - "doctype": "Newsletter", "subject": "_Test Newsletter", "send_from": "Test Sender ", "content_type": "Rich Text", "message": "Testing my news.", } - newsletter = frappe.get_doc({**newsletter_content, **kwargs}) - newsletter.append("email_group", {"email_group": "_Test Email Group"}) + similar_newsletters = frappe.db.get_all(doctype, newsletter_content, pluck="name") + + for similar_newsletter in similar_newsletters: + frappe.delete_doc(doctype, similar_newsletter) - newsletter.insert(ignore_permissions=True) - newsletter.save() + newsletter = frappe.get_doc({"doctype": doctype, **newsletter_content, **kwargs}) + newsletter.append("email_group", {"email_group": "_Test Email Group"}) + newsletter.save(ignore_permissions=True) newsletter.reload() - newsletters.add(newsletter.name) + newsletters.append(newsletter.name) attached_files = frappe.get_all("File", { "attached_to_doctype": newsletter.doctype, @@ -148,8 +160,8 @@ class TestNewsletter(TestNewsletterMixin, unittest.TestCase): def test_portal(self): self.send_newsletter(published=1) frappe.set_user("test1@example.com") - newsletters = get_newsletter_list("Newsletter", None, None, 0) - self.assertEqual(len(newsletters), 1) + newsletter_list = get_newsletter_list("Newsletter", None, None, 0) + self.assertEqual(len(newsletter_list), 1) def test_newsletter_context(self): context = frappe._dict() From ccebece486ffea29c34161d0ace0e504a9b335ef Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Fri, 13 Aug 2021 17:37:20 +0530 Subject: [PATCH 120/306] ci(Mergify): configuration update Signed-off-by: Suraj Shetty --- .mergify.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.mergify.yml b/.mergify.yml index c759c1e3ec..1a81a28594 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,4 +1,16 @@ pull_request_rules: + - name: Auto-close PRs on stable branch + conditions: + - or: + - base=version-13 + - base=version-12 + actions: + close: + comment: + message: | + @{{author}}, thanks for the contribution, but we do not accept pull requests on a stable branch. Please raise PR on an appropriate hotfix branch. + https://github.com/frappe/erpnext/wiki/Pull-Request-Checklist#which-branch + - name: Automatic merge on CI success and review conditions: - status-success=Sider From ead26527b7c0df4b4b011bd0962e751f15aa01b1 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Fri, 13 Aug 2021 18:14:47 +0530 Subject: [PATCH 121/306] ci: ignore js only changes while running unittests (#13932) * ci: ignore js only changes while running unittests - IF PR only changes JS files then unittests / patch tests wont run. - Change done to save resources / concurrent builds. * ci: ignore md files in build --- .github/workflows/patch-mariadb-tests.yml | 7 ++++++- .github/workflows/server-mariadb-tests.yml | 6 ++++++ .github/workflows/server-postgres-tests.yml | 3 +++ .github/workflows/ui-tests.yml | 2 ++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.github/workflows/patch-mariadb-tests.yml b/.github/workflows/patch-mariadb-tests.yml index e8627a01fb..82be4d06b5 100644 --- a/.github/workflows/patch-mariadb-tests.yml +++ b/.github/workflows/patch-mariadb-tests.yml @@ -1,6 +1,11 @@ name: Patch -on: [pull_request, workflow_dispatch] +on: + pull_request: + paths-ignore: + - '**.js' + - '**.md' + workflow_dispatch: jobs: test: diff --git a/.github/workflows/server-mariadb-tests.yml b/.github/workflows/server-mariadb-tests.yml index 2476102e3d..8d5bd690a1 100644 --- a/.github/workflows/server-mariadb-tests.yml +++ b/.github/workflows/server-mariadb-tests.yml @@ -2,9 +2,15 @@ name: Server on: pull_request: + paths-ignore: + - '**.js' + - '**.md' workflow_dispatch: push: branches: [ develop ] + paths-ignore: + - '**.js' + - '**.md' jobs: test: diff --git a/.github/workflows/server-postgres-tests.yml b/.github/workflows/server-postgres-tests.yml index 4325eebaad..8c97c7f84b 100644 --- a/.github/workflows/server-postgres-tests.yml +++ b/.github/workflows/server-postgres-tests.yml @@ -2,6 +2,9 @@ name: Server on: pull_request: + paths-ignore: + - '**.js' + - '**.md' workflow_dispatch: jobs: diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml index f342c0709e..d76e5e77ea 100644 --- a/.github/workflows/ui-tests.yml +++ b/.github/workflows/ui-tests.yml @@ -2,6 +2,8 @@ name: UI on: pull_request: + paths-ignore: + - '**.md' workflow_dispatch: push: branches: [ develop ] From 4312d15f574004c21d0dd7557c7145edd5e4350b Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Sat, 14 Aug 2021 19:35:36 +0530 Subject: [PATCH 122/306] perf: Grid rendering --- frappe/public/js/frappe/form/grid.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js index cda052553f..8de1600c05 100644 --- a/frappe/public/js/frappe/form/grid.js +++ b/frappe/public/js/frappe/form/grid.js @@ -502,7 +502,7 @@ export default class Grid { this.set_editable_grid_column_disp(fieldname, show); } - this.refresh(true); + this.debounced_refresh(); } set_editable_grid_column_disp(fieldname, show) { @@ -546,17 +546,17 @@ export default class Grid { toggle_reqd(fieldname, reqd) { this.get_docfield(fieldname).reqd = reqd; - this.refresh(); + this.debounced_refresh(); } toggle_enable(fieldname, enable) { this.get_docfield(fieldname).read_only = enable ? 0 : 1; - this.refresh(); + this.debounced_refresh(); } toggle_display(fieldname, show) { this.get_docfield(fieldname).hidden = show ? 0 : 1; - this.refresh(); + this.debounced_refresh(); } toggle_checkboxes(enable) { From 1e38d5a281d0438be3a45134fff632cbce410313 Mon Sep 17 00:00:00 2001 From: Samuel Danieli <23150094+scdanieli@users.noreply.github.com> Date: Mon, 16 Aug 2021 18:55:09 +0200 Subject: [PATCH 123/306] fix: broken link --- frappe/automation/doctype/auto_repeat/auto_repeat.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/automation/doctype/auto_repeat/auto_repeat.js b/frappe/automation/doctype/auto_repeat/auto_repeat.js index 896a10dfe0..80f2255f47 100644 --- a/frappe/automation/doctype/auto_repeat/auto_repeat.js +++ b/frappe/automation/doctype/auto_repeat/auto_repeat.js @@ -30,7 +30,7 @@ frappe.ui.form.on('Auto Repeat', { refresh: function(frm) { // auto repeat message if (frm.is_new()) { - let customize_form_link = `${__('Customize Form')}`; + let customize_form_link = `${__('Customize Form')}`; frm.dashboard.set_headline(__('To configure Auto Repeat, enable "Allow Auto Repeat" from {0}.', [customize_form_link])); } From 82b4a1ebc6d3768db04303c51e80d67ff63e3f81 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 17 Aug 2021 09:29:17 +0530 Subject: [PATCH 124/306] refactor(user): Remove unused code --- frappe/core/doctype/user/user.py | 67 -------------------------------- 1 file changed, 67 deletions(-) diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py index 5d799f8ee9..307ed69789 100644 --- a/frappe/core/doctype/user/user.py +++ b/frappe/core/doctype/user/user.py @@ -1048,73 +1048,6 @@ def update_gravatar(name): if gravatar: frappe.db.set_value('User', name, 'user_image', gravatar) -@frappe.whitelist(allow_guest=True) -def send_token_via_sms(tmp_id,phone_no=None,user=None): - try: - from frappe.core.doctype.sms_settings.sms_settings import send_request - except: - return False - - if not frappe.cache().ttl(tmp_id + '_token'): - return False - ss = frappe.get_doc('SMS Settings', 'SMS Settings') - if not ss.sms_gateway_url: - return False - - token = frappe.cache().get(tmp_id + '_token') - args = {ss.message_parameter: 'verification code is {}'.format(token)} - - for d in ss.get("parameters"): - args[d.parameter] = d.value - - if user: - user_phone = frappe.db.get_value('User', user, ['phone','mobile_no'], as_dict=1) - usr_phone = user_phone.mobile_no or user_phone.phone - if not usr_phone: - return False - else: - if phone_no: - usr_phone = phone_no - else: - return False - - args[ss.receiver_parameter] = usr_phone - status = send_request(ss.sms_gateway_url, args, use_post=ss.use_post) - - if 200 <= status < 300: - frappe.cache().delete(tmp_id + '_token') - return True - else: - return False - -@frappe.whitelist(allow_guest=True) -def send_token_via_email(tmp_id,token=None): - import pyotp - - user = frappe.cache().get(tmp_id + '_user') - count = token or frappe.cache().get(tmp_id + '_token') - - if ((not user) or (user == 'None') or (not count)): - return False - user_email = frappe.db.get_value('User',user, 'email') - if not user_email: - return False - - otpsecret = frappe.cache().get(tmp_id + '_otp_secret') - hotp = pyotp.HOTP(otpsecret) - - frappe.sendmail( - recipients=user_email, - sender=None, - subject="Verification Code", - template="verification_code", - args=dict(code=hotp.at(int(count))), - delayed=False, - retry=3 - ) - - return True - @frappe.whitelist(allow_guest=True) def reset_otp_secret(user): otp_issuer = frappe.db.get_value('System Settings', 'System Settings', 'otp_issuer_name') From 4c5959afd66f01c17d1fdda4421e2a982e66e12a Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 17 Aug 2021 09:54:19 +0530 Subject: [PATCH 125/306] refactor: Move reset_otp_secret to twofactor.py --- frappe/core/doctype/user/user.js | 2 +- frappe/core/doctype/user/user.py | 18 ------------------ frappe/twofactor.py | 20 ++++++++++++++++++++ 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/frappe/core/doctype/user/user.js b/frappe/core/doctype/user/user.js index 8c5b89c5fc..96726d875c 100644 --- a/frappe/core/doctype/user/user.js +++ b/frappe/core/doctype/user/user.js @@ -166,7 +166,7 @@ frappe.ui.form.on('User', { frm.add_custom_button(__("Reset OTP Secret"), function() { frappe.call({ - method: "frappe.core.doctype.user.user.reset_otp_secret", + method: "frappe.twofactor.reset_otp_secret", args: { "user": frm.doc.name } diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py index 307ed69789..590af3af25 100644 --- a/frappe/core/doctype/user/user.py +++ b/frappe/core/doctype/user/user.py @@ -1048,24 +1048,6 @@ def update_gravatar(name): if gravatar: frappe.db.set_value('User', name, 'user_image', gravatar) -@frappe.whitelist(allow_guest=True) -def reset_otp_secret(user): - otp_issuer = frappe.db.get_value('System Settings', 'System Settings', 'otp_issuer_name') - user_email = frappe.db.get_value('User',user, 'email') - if frappe.session.user in ["Administrator", user] : - frappe.defaults.clear_default(user + '_otplogin') - frappe.defaults.clear_default(user + '_otpsecret') - email_args = { - 'recipients':user_email, 'sender':None, 'subject':'OTP Secret Reset - {}'.format(otp_issuer or "Frappe Framework"), - 'message':'

Your OTP secret on {} has been reset. If you did not perform this reset and did not request it, please contact your System Administrator immediately.

'.format(otp_issuer or "Frappe Framework"), - 'delayed':False, - 'retry':3 - } - enqueue(method=frappe.sendmail, queue='short', timeout=300, event=None, is_async=True, job_name=None, now=False, **email_args) - return frappe.msgprint(_("OTP Secret has been reset. Re-registration will be required on next login.")) - else: - return frappe.throw(_("OTP secret can only be reset by the Administrator.")) - def throttle_user_creation(): if frappe.flags.in_import: return diff --git a/frappe/twofactor.py b/frappe/twofactor.py index c2fb6d5de9..b2f562c20d 100644 --- a/frappe/twofactor.py +++ b/frappe/twofactor.py @@ -398,3 +398,23 @@ def should_remove_barcode_image(barcode): def disable(): frappe.db.set_value('System Settings', None, 'enable_two_factor_auth', 0) + +@frappe.whitelist() +def reset_otp_secret(user): + otp_issuer = frappe.db.get_value('System Settings', 'System Settings', 'otp_issuer_name') + user_email = frappe.db.get_value('User', user, 'email') + if frappe.session.user in ["Administrator", user] : + frappe.defaults.clear_default(user + '_otplogin') + frappe.defaults.clear_default(user + '_otpsecret') + email_args = { + 'recipients': user_email, + 'sender': None, + 'subject': _('OTP Secret Reset - {0}').format(otp_issuer or "Frappe Framework"), + 'message': _('

Your OTP secret on {0} has been reset. If you did not perform this reset and did not request it, please contact your System Administrator immediately.

').format(otp_issuer or "Frappe Framework"), + 'delayed':False, + 'retry':3 + } + enqueue(method=frappe.sendmail, queue='short', timeout=300, event=None, is_async=True, job_name=None, now=False, **email_args) + return frappe.msgprint(_("OTP Secret has been reset. Re-registration will be required on next login.")) + else: + return frappe.throw(_("OTP secret can only be reset by the Administrator.")) \ No newline at end of file From 87f05c2e6bae9b8cef7ccf4e7bd38f086bd4057e Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 17 Aug 2021 09:57:32 +0530 Subject: [PATCH 126/306] ci: Handle payload elements as not set/None alt motive: Re-trigger GHAs that have been showing waiting for too long ;) --- .github/helper/documentation.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/helper/documentation.py b/.github/helper/documentation.py index 08d1d1aa9c..f8ee3fa10b 100644 --- a/.github/helper/documentation.py +++ b/.github/helper/documentation.py @@ -32,9 +32,9 @@ if __name__ == "__main__": if response.ok: payload = response.json() - title = payload.get("title", "").lower() - head_sha = payload.get("head", {}).get("sha") - body = payload.get("body", "").lower() + title = (payload.get("title") or "").lower() + head_sha = (payload.get("head") or {}).get("sha") + body = (payload.get("body") or "").lower() if title.startswith("feat") and head_sha and "no-docs" not in body: if docs_link_exists(body): From 3f2a93201b90bd7c130f576c5510aaf71d3c37c0 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 17 Aug 2021 10:00:39 +0530 Subject: [PATCH 127/306] refactor: Move email account related code to email_account.py --- frappe/core/doctype/user/user.py | 71 ------------------- .../doctype/email_account/email_account.py | 70 ++++++++++++++++-- 2 files changed, 66 insertions(+), 75 deletions(-) diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py index 590af3af25..5e80083791 100644 --- a/frappe/core/doctype/user/user.py +++ b/frappe/core/doctype/user/user.py @@ -21,11 +21,6 @@ from frappe.core.doctype.user_type.user_type import user_linked_with_permission_ STANDARD_USERS = ("Guest", "Administrator") - -class MaxUsersReachedError(frappe.ValidationError): - pass - - class User(Document): __new_password = None @@ -731,72 +726,6 @@ def set_email_password(email_account, user, password): return False return True - -def setup_user_email_inbox(email_account, awaiting_password, email_id, enable_outgoing): - """ setup email inbox for user """ - def add_user_email(user): - user = frappe.get_doc("User", user) - row = user.append("user_emails", {}) - - row.email_id = email_id - row.email_account = email_account - row.awaiting_password = awaiting_password or 0 - row.enable_outgoing = enable_outgoing or 0 - - user.save(ignore_permissions=True) - - udpate_user_email_settings = False - if not all([email_account, email_id]): - return - - user_names = frappe.db.get_values("User", { "email": email_id }, as_dict=True) - if not user_names: - return - - for user in user_names: - user_name = user.get("name") - - # check if inbox is alreay configured - user_inbox = frappe.db.get_value("User Email", { - "email_account": email_account, - "parent": user_name - }, ["name"]) or None - - if not user_inbox: - add_user_email(user_name) - else: - # update awaiting password for email account - udpate_user_email_settings = True - - if udpate_user_email_settings: - frappe.db.sql("""UPDATE `tabUser Email` SET awaiting_password = %(awaiting_password)s, - enable_outgoing = %(enable_outgoing)s WHERE email_account = %(email_account)s""", { - "email_account": email_account, - "enable_outgoing": enable_outgoing, - "awaiting_password": awaiting_password or 0 - }) - else: - users = " and ".join([frappe.bold(user.get("name")) for user in user_names]) - frappe.msgprint(_("Enabled email inbox for user {0}").format(users)) - - ask_pass_update() - -def remove_user_email_inbox(email_account): - """ remove user email inbox settings if email account is deleted """ - if not email_account: - return - - users = frappe.get_all("User Email", filters={ - "email_account": email_account - }, fields=["parent as name"]) - - for user in users: - doc = frappe.get_doc("User", user.get("name")) - to_remove = [ row for row in doc.user_emails if row.email_account == email_account ] - [ doc.remove(row) for row in to_remove ] - - doc.save(ignore_permissions=True) - def ask_pass_update(): # update the sys defaults as to awaiting users from frappe.utils import set_default diff --git a/frappe/email/doctype/email_account/email_account.py b/frappe/email/doctype/email_account/email_account.py index ecd59f42bb..78e0be1017 100755 --- a/frappe/email/doctype/email_account/email_account.py +++ b/frappe/email/doctype/email_account/email_account.py @@ -137,8 +137,6 @@ class EmailAccount(Document): def on_update(self): """Check there is only one default of each type.""" - from frappe.core.doctype.user.user import setup_user_email_inbox - self.check_automatic_linking_email_account() self.there_must_be_only_one_default() setup_user_email_inbox(email_account=self.name, awaiting_password=self.awaiting_password, @@ -532,8 +530,6 @@ class EmailAccount(Document): def on_trash(self): """Clear communications where email account is linked""" - from frappe.core.doctype.user.user import remove_user_email_inbox - frappe.db.sql("update `tabCommunication` set email_account='' where email_account=%s", self.name) remove_user_email_inbox(email_account=self.name) @@ -724,3 +720,69 @@ def get_max_email_uid(email_account): else: max_uid = cint(result[0].get("uid", 0)) + 1 return max_uid + + +def setup_user_email_inbox(email_account, awaiting_password, email_id, enable_outgoing): + """ setup email inbox for user """ + from frappe.core.doctype.user import ask_pass_update + def add_user_email(user): + user = frappe.get_doc("User", user) + row = user.append("user_emails", {}) + + row.email_id = email_id + row.email_account = email_account + row.awaiting_password = awaiting_password or 0 + row.enable_outgoing = enable_outgoing or 0 + + user.save(ignore_permissions=True) + + udpate_user_email_settings = False + if not all([email_account, email_id]): + return + + user_names = frappe.db.get_values("User", { "email": email_id }, as_dict=True) + if not user_names: + return + + for user in user_names: + user_name = user.get("name") + + # check if inbox is alreay configured + user_inbox = frappe.db.get_value("User Email", { + "email_account": email_account, + "parent": user_name + }, ["name"]) or None + + if not user_inbox: + add_user_email(user_name) + else: + # update awaiting password for email account + udpate_user_email_settings = True + + if udpate_user_email_settings: + frappe.db.sql("""UPDATE `tabUser Email` SET awaiting_password = %(awaiting_password)s, + enable_outgoing = %(enable_outgoing)s WHERE email_account = %(email_account)s""", { + "email_account": email_account, + "enable_outgoing": enable_outgoing, + "awaiting_password": awaiting_password or 0 + }) + else: + users = " and ".join([frappe.bold(user.get("name")) for user in user_names]) + frappe.msgprint(_("Enabled email inbox for user {0}").format(users)) + ask_pass_update() + +def remove_user_email_inbox(email_account): + """ remove user email inbox settings if email account is deleted """ + if not email_account: + return + + users = frappe.get_all("User Email", filters={ + "email_account": email_account + }, fields=["parent as name"]) + + for user in users: + doc = frappe.get_doc("User", user.get("name")) + to_remove = [ row for row in doc.user_emails if row.email_account == email_account ] + [ doc.remove(row) for row in to_remove ] + + doc.save(ignore_permissions=True) From f6a757be5087f4d3bc262fcc0003ac09e213e6f9 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 17 Aug 2021 10:08:12 +0530 Subject: [PATCH 128/306] test: Add test case for user rename --- frappe/core/doctype/user/test_user.py | 97 ++++++++++----------------- 1 file changed, 35 insertions(+), 62 deletions(-) diff --git a/frappe/core/doctype/user/test_user.py b/frappe/core/doctype/user/test_user.py index 392128834d..383967a549 100644 --- a/frappe/core/doctype/user/test_user.py +++ b/frappe/core/doctype/user/test_user.py @@ -1,13 +1,10 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # MIT License. See license.txt -import frappe, unittest, uuid +import frappe, unittest from frappe.model.delete_doc import delete_doc -from frappe.utils.data import today, add_to_date -from frappe import _dict from frappe.utils import get_url -from frappe.core.doctype.user.user import get_total_users -from frappe.core.doctype.user.user import MaxUsersReachedError, test_password_strength +from frappe.core.doctype.user.user import test_password_strength from frappe.core.doctype.user.user import extract_mentions from frappe.frappeclient import FrappeClient @@ -119,37 +116,6 @@ class TestUser(unittest.TestCase): # system manager now added by Administrator self.assertTrue("System Manager" in [d.role for d in me.get("roles")]) - # def test_deny_multiple_sessions(self): - # from frappe.installer import update_site_config - # clear_limit('users') - # - # # allow one session - # user = frappe.get_doc('User', 'test@example.com') - # user.simultaneous_sessions = 1 - # user.new_password = 'Eastern_43A1W' - # user.save() - # - # def test_request(conn): - # value = conn.get_value('User', 'first_name', {'name': 'test@example.com'}) - # self.assertTrue('first_name' in value) - # - # from frappe.frappeclient import FrappeClient - # update_site_config('deny_multiple_sessions', 0) - # - # conn1 = FrappeClient(get_url(), "test@example.com", "Eastern_43A1W", verify=False) - # test_request(conn1) - # - # conn2 = FrappeClient(get_url(), "test@example.com", "Eastern_43A1W", verify=False) - # test_request(conn2) - # - # update_site_config('deny_multiple_sessions', 1) - # conn3 = FrappeClient(get_url(), "test@example.com", "Eastern_43A1W", verify=False) - # test_request(conn3) - # - # # first connection should fail - # test_request(conn1) - - def test_delete_user(self): new_user = frappe.get_doc(dict(doctype='User', email='test-for-delete@example.com', first_name='Tester Delete User')).insert() @@ -227,6 +193,7 @@ class TestUser(unittest.TestCase): self.assertEqual(extract_mentions(comment)[0], "test_user@example.com") self.assertEqual(extract_mentions(comment)[1], "test.again@example1.com") + frappe.delete_doc("User Group", "Team") doc = frappe.get_doc({ 'doctype': 'User Group', 'name': 'Team', @@ -236,7 +203,8 @@ class TestUser(unittest.TestCase): 'user': 'test1@example.com' }] }) - doc.insert(ignore_if_duplicate=True) + + doc.insert() comment = '''
@@ -267,31 +235,36 @@ class TestUser(unittest.TestCase): self.assertEqual(res1.status_code, 200) self.assertEqual(res2.status_code, 417) - # def test_user_rollback(self): - # """ - # FIXME: This is failing with PR #12693 as Rollback can't happen if notifications sent on user creation. - # Make sure that notifications disabled. - # """ - # frappe.db.commit() - # frappe.db.begin() - # user_id = str(uuid.uuid4()) - # email = f'{user_id}@example.com' - # try: - # frappe.flags.in_import = True # disable throttling - # frappe.get_doc(dict( - # doctype='User', - # email=email, - # first_name=user_id, - # )).insert() - # finally: - # frappe.flags.in_import = False - - # # Check user has been added - # self.assertIsNotNone(frappe.db.get("User", {"email": email})) - - # # Check that rollback works - # frappe.db.rollback() - # self.assertIsNone(frappe.db.get("User", {"email": email})) + def test_user_rename(self): + old_name = "test_user_rename@example.com" + new_name = "test_user_rename_new@example.com" + user = frappe.get_doc({ + "doctype": "User", + "email": old_name, + "enabled": 1, + "first_name": "_Test", + "new_password": "Eastern_43A1W", + "roles": [ + { + "doctype": "Has Role", + "parentfield": "roles", + "role": "System Manager" + }] + }).insert(ignore_permissions=True, ignore_if_duplicate=True) + + frappe.rename_doc('User', user.name, new_name) + self.assertTrue(frappe.db.exists("Notification Settings", new_name)) + + frappe.delete_doc("User", new_name) + + def test_signup(self): + pass + + def test_password_update(self): + pass + + def test_password_verification(self): + pass def delete_contact(user): frappe.db.sql("DELETE FROM `tabContact` WHERE `email_id`= %s", user) From 475c3ec8b8eb13aa09922805a722f0d2f4d05c4f Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 17 Aug 2021 10:24:12 +0530 Subject: [PATCH 129/306] fix: import error --- frappe/email/doctype/email_account/email_account.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/email/doctype/email_account/email_account.py b/frappe/email/doctype/email_account/email_account.py index 78e0be1017..b29d4ee9cd 100755 --- a/frappe/email/doctype/email_account/email_account.py +++ b/frappe/email/doctype/email_account/email_account.py @@ -724,7 +724,7 @@ def get_max_email_uid(email_account): def setup_user_email_inbox(email_account, awaiting_password, email_id, enable_outgoing): """ setup email inbox for user """ - from frappe.core.doctype.user import ask_pass_update + from frappe.core.doctype.user.user import ask_pass_update def add_user_email(user): user = frappe.get_doc("User", user) row = user.append("user_emails", {}) From 9b15009e7a359f6a543b9690a67c3d6aa20e395c Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 17 Aug 2021 11:08:35 +0530 Subject: [PATCH 130/306] fix: Enable paragraph text styling (Bold, Italic, link) --- .../public/js/frappe/views/workspace/blocks/paragraph.js | 7 +++++-- frappe/public/scss/desk/desktop.scss | 6 +++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/frappe/public/js/frappe/views/workspace/blocks/paragraph.js b/frappe/public/js/frappe/views/workspace/blocks/paragraph.js index b594f3459a..26afa65d51 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/paragraph.js +++ b/frappe/public/js/frappe/views/workspace/blocks/paragraph.js @@ -123,10 +123,10 @@ export default class Paragraph extends Block { return true; } - save(toolsContent) { + save() { this.wrapper = this._element; return { - text: toolsContent.innerText, + text: this.wrapper.innerHTML, col: this.get_col(), }; } @@ -155,6 +155,9 @@ export default class Paragraph extends Block { return { text: { br: true, + b: true, + i: true, + a: true } }; } diff --git a/frappe/public/scss/desk/desktop.scss b/frappe/public/scss/desk/desktop.scss index 0db526978f..49ed07bbce 100644 --- a/frappe/public/scss/desk/desktop.scss +++ b/frappe/public/scss/desk/desktop.scss @@ -946,7 +946,11 @@ body { &.new-widget { align-items: inherit; } - + + &.ce-paragraph { + display: block; + } + .paragraph-control { display: flex; flex-direction: row-reverse; From 0215bd06ecce32b22033f98afaa69f6a34748982 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 17 Aug 2021 11:09:22 +0530 Subject: [PATCH 131/306] fix: Make Shortcut's & Card's default size col-4 --- frappe/public/js/frappe/views/workspace/blocks/card.js | 2 +- frappe/public/js/frappe/views/workspace/blocks/shortcut.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/views/workspace/blocks/card.js b/frappe/public/js/frappe/views/workspace/blocks/card.js index 975b32eea7..15e27fed40 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/card.js +++ b/frappe/public/js/frappe/views/workspace/blocks/card.js @@ -14,7 +14,7 @@ export default class Card extends Block { constructor({ data, api, config, readOnly, block }) { super({ data, api, config, readOnly, block }); this.sections = {}; - this.col = this.data.col ? this.data.col : "12"; + this.col = this.data.col ? this.data.col : "4"; this.allow_customization = !this.readOnly; this.options = { allow_sorting: this.allow_customization, diff --git a/frappe/public/js/frappe/views/workspace/blocks/shortcut.js b/frappe/public/js/frappe/views/workspace/blocks/shortcut.js index 0943de202d..f7482a06f3 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/shortcut.js +++ b/frappe/public/js/frappe/views/workspace/blocks/shortcut.js @@ -13,7 +13,7 @@ export default class Shortcut extends Block { constructor({ data, api, config, readOnly, block }) { super({ data, api, config, readOnly, block }); - this.col = this.data.col ? this.data.col : "12"; + this.col = this.data.col ? this.data.col : "4"; this.allow_customization = !this.readOnly; this.options = { allow_sorting: this.allow_customization, From 013f1f471df8010c81ab65874085e7e11f78e64e Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 17 Aug 2021 11:11:15 +0530 Subject: [PATCH 132/306] fix: Switch Public-Private, Change Customize to Edit, Add Settings button to redirect to workspace document --- frappe/desk/desktop.py | 2 +- .../js/frappe/views/workspace/workspace.js | 30 +++++++++++-------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index 27b985e429..e9036b98b0 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -368,7 +368,7 @@ def get_desktop_page(page): on desk. Args: - page (string): page name + page (json): page data Returns: dict: dictionary of cards, charts and shortcuts to be displayed on website diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index b46c220d9d..719645feea 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -32,8 +32,8 @@ frappe.views.Workspace = class Workspace { 'private': {} }; this.sidebar_categories = [ - 'Public', - frappe.user.first_name() || 'Private' + 'My Workspaces', + 'Public' ]; this.tools = { header: { @@ -357,7 +357,7 @@ frappe.views.Workspace = class Workspace { let current_page = pages.filter(p => p.title == page.name)[0]; if (!this.is_read_only) { - this.setup_customization_buttons(current_page.is_editable); + this.setup_customization_buttons(current_page); return; } @@ -365,20 +365,20 @@ frappe.views.Workspace = class Workspace { this.page.clear_secondary_action(); this.page.clear_inner_toolbar(); - current_page.is_editable && this.page.set_secondary_action(__("Customize"), () => { + current_page.is_editable && this.page.set_secondary_action(__("Edit"), () => { if (!this.editor || !this.editor.readOnly) return; this.is_read_only = false; this.editor.readOnly.toggle(); this.editor.isReady.then(() => { this.initialize_editorjs_undo(); - this.setup_customization_buttons(true); + this.setup_customization_buttons(current_page); this.show_sidebar_actions(); this.make_sidebar_sortable(); this.make_blocks_sortable(); }); }); - this.page.add_inner_button(__("Create Page"), () => { + this.page.add_inner_button(__("Create Workspace"), () => { this.initialize_new_page(); }); } @@ -389,13 +389,13 @@ frappe.views.Workspace = class Workspace { this.undo.readOnly = false; } - setup_customization_buttons(is_editable) { + setup_customization_buttons(page) { let me = this; this.page.clear_primary_action(); this.page.clear_secondary_action(); this.page.clear_inner_toolbar(); - is_editable && this.page.set_primary_action( + page.is_editable && this.page.set_primary_action( __("Save Customizations"), () => { this.page.clear_primary_action(); @@ -424,6 +424,10 @@ frappe.views.Workspace = class Workspace { } ); + page.name && this.page.add_inner_button(__("Settings"), () => { + frappe.set_route(`workspace/${page.name}`); + }); + Object.keys(this.blocks).forEach(key => { this.page.add_inner_button(` ${this.blocks[key].toolbox.icon} @@ -446,7 +450,7 @@ frappe.views.Workspace = class Workspace { $(`${frappe.utils.icon("lock", "sm")}`) .appendTo(sidebar_control); sidebar_control.parent().click(() => { - frappe.show_alert({ + !this.is_read_only && frappe.show_alert({ message: __("Only Workspace Manager can sort or edit this page"), indicator: 'info' }, 5); @@ -498,9 +502,9 @@ frappe.views.Workspace = class Workspace { prepare_sorted_sidebar(is_public) { if (is_public) { - this.sorted_public_items = this.sort_sidebar(this.sidebar.find('.standard-sidebar-section').first()); + this.sorted_public_items = this.sort_sidebar(this.sidebar.find('.standard-sidebar-section').last()); } else { - this.sorted_private_items = this.sort_sidebar(this.sidebar.find('.standard-sidebar-section').last()); + this.sorted_private_items = this.sort_sidebar(this.sidebar.find('.standard-sidebar-section').first()); } } @@ -578,7 +582,7 @@ frappe.views.Workspace = class Workspace { if (!this.validate_page(values)) return; d.hide(); this.initialize_editorjs_undo(); - this.setup_customization_buttons(true); + this.setup_customization_buttons({is_editable: true}); this.title = values.title; this.icon = values.icon; this.parent = values.parent; @@ -647,7 +651,7 @@ frappe.views.Workspace = class Workspace { ); $sidebar_item.find('.sidebar-item-control .drag-handle').css('margin-right', '8px'); - let $sidebar_section = is_public ? $sidebar[0] : $sidebar[1]; + let $sidebar_section = is_public ? $sidebar[1] : $sidebar[0]; if (!parent) { !is_public && $sidebar.last().removeClass('hidden'); From 3e7e35351b043e6d36cc6e23a8250e6cf6e1d437 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 17 Aug 2021 11:20:05 +0530 Subject: [PATCH 133/306] refactor: Move set_email_password code to email_account.py --- frappe/core/doctype/user/user.py | 13 ------------- .../email/doctype/email_account/email_account.py | 14 ++++++++++++++ frappe/public/js/frappe/desk.js | 2 +- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py index 5e80083791..86d2f7726e 100644 --- a/frappe/core/doctype/user/user.py +++ b/frappe/core/doctype/user/user.py @@ -713,19 +713,6 @@ def get_email_awaiting(user): where parent = %(user)s""",{"user":user}) return False -@frappe.whitelist(allow_guest=False) -def set_email_password(email_account, user, password): - account = frappe.get_doc("Email Account", email_account) - if account.awaiting_password: - account.awaiting_password = 0 - account.password = password - try: - account.save(ignore_permissions=True) - except Exception: - frappe.db.rollback() - return False - - return True def ask_pass_update(): # update the sys defaults as to awaiting users from frappe.utils import set_default diff --git a/frappe/email/doctype/email_account/email_account.py b/frappe/email/doctype/email_account/email_account.py index b29d4ee9cd..a1ddbf7a68 100755 --- a/frappe/email/doctype/email_account/email_account.py +++ b/frappe/email/doctype/email_account/email_account.py @@ -786,3 +786,17 @@ def remove_user_email_inbox(email_account): [ doc.remove(row) for row in to_remove ] doc.save(ignore_permissions=True) + +@frappe.whitelist(allow_guest=False) +def set_email_password(email_account, user, password): + account = frappe.get_doc("Email Account", email_account) + if account.awaiting_password: + account.awaiting_password = 0 + account.password = password + try: + account.save(ignore_permissions=True) + except Exception: + frappe.db.rollback() + return False + + return True \ No newline at end of file diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js index 810b6a404a..99fc4da182 100644 --- a/frappe/public/js/frappe/desk.js +++ b/frappe/public/js/frappe/desk.js @@ -230,7 +230,7 @@ frappe.Application = class Application { s.fields_dict.checking.$wrapper.html(''); s.show(); frappe.call({ - method: 'frappe.core.doctype.user.user.set_email_password', + method: 'frappe.email.doctype.email_account.email_account.set_email_password', args: { "email_account": email_account[i]["email_account"], "user": user, From 7e72a0f304401c212a6460ba3cf5658ca28f7e26 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 17 Aug 2021 11:21:31 +0530 Subject: [PATCH 134/306] fix: Disabled user check in signup --- frappe/core/doctype/user/user.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py index 86d2f7726e..378e10a409 100644 --- a/frappe/core/doctype/user/user.py +++ b/frappe/core/doctype/user/user.py @@ -764,10 +764,10 @@ def sign_up(email, full_name, redirect_to): user = frappe.db.get("User", {"email": email}) if user: - if user.disabled: - return 0, _("Registered but disabled") - else: + if user.enabled: return 0, _("Already Registered") + else: + return 0, _("Registered but disabled") else: if frappe.db.sql("""select count(*) from tabUser where HOUR(TIMEDIFF(CURRENT_TIMESTAMP, TIMESTAMP(modified)))=1""")[0][0] > 300: From 8924fd071606bb96ee01a383e11e96d077d85b87 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 17 Aug 2021 11:22:04 +0530 Subject: [PATCH 135/306] test: Add signup test case --- frappe/core/doctype/user/test_user.py | 28 ++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/frappe/core/doctype/user/test_user.py b/frappe/core/doctype/user/test_user.py index 383967a549..41479fb05c 100644 --- a/frappe/core/doctype/user/test_user.py +++ b/frappe/core/doctype/user/test_user.py @@ -4,10 +4,11 @@ import frappe, unittest from frappe.model.delete_doc import delete_doc from frappe.utils import get_url -from frappe.core.doctype.user.user import test_password_strength -from frappe.core.doctype.user.user import extract_mentions +from frappe.core.doctype.user.user import test_password_strength, extract_mentions, sign_up from frappe.frappeclient import FrappeClient +from unittest.mock import patch + test_records = frappe.get_test_records('User') class TestUser(unittest.TestCase): @@ -258,7 +259,28 @@ class TestUser(unittest.TestCase): frappe.delete_doc("User", new_name) def test_signup(self): - pass + import frappe.website.utils + import frappe.exceptions + random_user = frappe.mock('email') + random_user_name = frappe.mock('name') + # disabled signup + with patch.object(frappe.core.doctype.user.user, "is_signup_disabled", return_value=True): + self.assertRaisesRegex(frappe.exceptions.ValidationError, "Sign Up is disabled", + sign_up, random_user, random_user_name, "/signup") + + self.assertTupleEqual(sign_up(random_user, random_user_name, "/welcome"), (1, "Please check your email for verification")) + self.assertEqual(frappe.cache().hget('redirect_after_login', random_user), "/welcome") + + # re-register + self.assertTupleEqual(sign_up(random_user, random_user_name, "/welcome"), (0, "Already Registered")) + + # disabled user + user = frappe.get_doc("User", random_user) + user.enabled = 0 + user.save() + + self.assertTupleEqual(sign_up(random_user, random_user_name, "/welcome"), (0, "Registered but disabled")) + def test_password_update(self): pass From e401366cf9480468d8b5bd4c0af385a0f71575e8 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 17 Aug 2021 12:12:46 +0530 Subject: [PATCH 136/306] test: Renamed changed values --- cypress/integration/workspace.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cypress/integration/workspace.js b/cypress/integration/workspace.js index 9701e54c5e..f18e48aadc 100644 --- a/cypress/integration/workspace.js +++ b/cypress/integration/workspace.js @@ -14,7 +14,7 @@ context('Workspace 2.0', () => { it('Create Private Page', () => { cy.get('.codex-editor__redactor .ce-block'); - cy.get('.custom-actions button[data-label="Create%20Page"]').click(); + cy.get('.custom-actions button[data-label="Create%20Workspace"]').click(); cy.fill_field('title', 'Test Private Page', 'Data'); cy.fill_field('icon', 'edit', 'Icon'); cy.get_open_dialog().find('.modal-header').click(); @@ -29,7 +29,7 @@ context('Workspace 2.0', () => { cy.wait(500); cy.get('.codex-editor__redactor .ce-block'); - cy.get('.standard-actions .btn-secondary[data-label=Customize]').click(); + cy.get('.standard-actions .btn-secondary[data-label=Edit]').click(); }); it('Add New Block', () => { @@ -77,7 +77,7 @@ context('Workspace 2.0', () => { it('Delete Private Page', () => { cy.get('.codex-editor__redactor .ce-block'); - cy.get('.standard-actions .btn-secondary[data-label=Customize]').click(); + cy.get('.standard-actions .btn-secondary[data-label=Edit]').click(); cy.get('.sidebar-item-container[item-name="Test Private Page"]').find('.sidebar-item-control .delete-page').click(); cy.wait(300); From d36d6055ae24469933993bf30458350a2b42dee5 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 17 Aug 2021 13:45:39 +0530 Subject: [PATCH 137/306] refactor: Remove check demo and redundant code --- frappe/core/doctype/user/user.py | 48 ++++++++++++-------------------- 1 file changed, 18 insertions(+), 30 deletions(-) diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py index 378e10a409..b33e6916f5 100644 --- a/frappe/core/doctype/user/user.py +++ b/frappe/core/doctype/user/user.py @@ -51,8 +51,6 @@ class User(Document): frappe.cache().delete_key('enabled_users') def validate(self): - self.check_demo() - # clear new password self.__new_password = self.new_password self.new_password = "" @@ -132,10 +130,6 @@ class User(Document): """Returns true if current user is the session user""" return self.name == frappe.session.user - def check_demo(self): - if frappe.session.user == 'demo@erpnext.com': - frappe.throw(_('Cannot change user details in demo. Please signup for a new account at https://erpnext.com'), title=_('Not Allowed')) - def set_full_name(self): self.full_name = " ".join(filter(None, [self.first_name, self.last_name])) @@ -393,7 +387,6 @@ class User(Document): def before_rename(self, old_name, new_name, merge=False): - self.check_demo() frappe.clear_cache(user=old_name) self.validate_rename(old_name, new_name) @@ -725,24 +718,19 @@ def ask_pass_update(): def _get_user_for_update_password(key, old_password): # verify old password + result = frappe._dict() if key: - user = frappe.db.get_value("User", {"reset_password_key": key}) - if not user: - return { - 'message': _("The Link specified has either been used before or Invalid") - } + result.user = frappe.db.get_value("User", {"reset_password_key": key}) + if not result.user: + result.message = _("The Link specified has either been used before or Invalid") elif old_password: # verify old password frappe.local.login_manager.check_password(frappe.session.user, old_password) user = frappe.session.user + result.user = user - else: - return - - return { - 'user': user - } + return result def reset_user_data(user): user_doc = frappe.get_doc("User", user) @@ -1048,18 +1036,18 @@ def generate_keys(user): :param user: str """ - if "System Manager" in frappe.get_roles(): - user_details = frappe.get_doc("User", user) - api_secret = frappe.generate_hash(length=15) - # if api key is not set generate api key - if not user_details.api_key: - api_key = frappe.generate_hash(length=15) - user_details.api_key = api_key - user_details.api_secret = api_secret - user_details.save() - - return {"api_secret": api_secret} - frappe.throw(frappe._("Not Permitted"), frappe.PermissionError) + frappe.only_for("System Manager") + user_details = frappe.get_doc("User", user) + api_secret = frappe.generate_hash(length=15) + # if api key is not set generate api key + if not user_details.api_key: + api_key = frappe.generate_hash(length=15) + user_details.api_key = api_key + user_details.api_secret = api_secret + user_details.save() + + return {"api_secret": api_secret} + @frappe.whitelist() def switch_theme(theme): From 81a59377518a566aca8c92a01eec8c2cfa05c7cc Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 17 Aug 2021 13:47:58 +0530 Subject: [PATCH 138/306] test: Add "password update" test --- frappe/core/doctype/user/test_user.py | 59 +++++++++++++++++++++++---- 1 file changed, 52 insertions(+), 7 deletions(-) diff --git a/frappe/core/doctype/user/test_user.py b/frappe/core/doctype/user/test_user.py index 41479fb05c..72650679ae 100644 --- a/frappe/core/doctype/user/test_user.py +++ b/frappe/core/doctype/user/test_user.py @@ -4,11 +4,14 @@ import frappe, unittest from frappe.model.delete_doc import delete_doc from frappe.utils import get_url -from frappe.core.doctype.user.user import test_password_strength, extract_mentions, sign_up +from frappe.core.doctype.user.user import (test_password_strength, + extract_mentions, sign_up, update_password, verify_password) from frappe.frappeclient import FrappeClient from unittest.mock import patch +import frappe.exceptions +user_module = frappe.core.doctype.user.user test_records = frappe.get_test_records('User') class TestUser(unittest.TestCase): @@ -21,7 +24,7 @@ class TestUser(unittest.TestCase): def test_user_type(self): new_user = frappe.get_doc(dict(doctype='User', email='test-for-type@example.com', - first_name='Tester')).insert() + first_name='Tester')).insert(ignore_if_duplicate=True) self.assertEqual(new_user.user_type, 'Website User') # social login userid for frappe @@ -119,7 +122,7 @@ class TestUser(unittest.TestCase): def test_delete_user(self): new_user = frappe.get_doc(dict(doctype='User', email='test-for-delete@example.com', - first_name='Tester Delete User')).insert() + first_name='Tester Delete User')).insert(ignore_if_duplicate=True) self.assertEqual(new_user.user_type, 'Website User') # role with desk access @@ -260,11 +263,10 @@ class TestUser(unittest.TestCase): def test_signup(self): import frappe.website.utils - import frappe.exceptions random_user = frappe.mock('email') random_user_name = frappe.mock('name') # disabled signup - with patch.object(frappe.core.doctype.user.user, "is_signup_disabled", return_value=True): + with patch.object(user_module, "is_signup_disabled", return_value=True): self.assertRaisesRegex(frappe.exceptions.ValidationError, "Sign Up is disabled", sign_up, random_user, random_user_name, "/signup") @@ -282,8 +284,51 @@ class TestUser(unittest.TestCase): self.assertTupleEqual(sign_up(random_user, random_user_name, "/welcome"), (0, "Registered but disabled")) - def test_password_update(self): - pass + def test_reset_password(self): + from frappe.utils import set_request + from frappe.auth import CookieManager + from frappe.auth import LoginManager + old_password = "Eastern_43A1W" + new_password = "easy_password" + + set_request(path="/random") + frappe.local.cookie_manager = CookieManager() + frappe.local.login_manager = LoginManager() + + frappe.set_user("test@example.com") + test_user = frappe.get_doc("User", "test@example.com") + test_user.reset_password() + frappe.cache().hset('redirect_after_login', test_user.email, "/some_portal_page") + self.assertEqual(update_password(new_password, key=test_user.reset_password_key), "/app") + self.assertEqual(update_password(new_password, key="wrong_key"), "The Link specified has either been used before or Invalid") + + # password verification should fail with old password + self.assertRaises(frappe.exceptions.AuthenticationError, verify_password, old_password) + verify_password(new_password) + + # reset password + update_password(old_password, old_password=new_password) + + self.assertRaisesRegex(frappe.exceptions.ValidationError, "Invalid key type", update_password, "test", 1, ['like', '%']) + + password_strength_response = { + "feedback": { + "password_policy_validation_passed": False, + "suggestions": ["Fix password"] + } + } + + # password strength failure test + with patch.object(user_module, "test_password_strength", return_value=password_strength_response): + self.assertRaisesRegex(frappe.exceptions.ValidationError, "Fix password", update_password, new_password, 0, test_user.reset_password_key) + + + # test redirect URL for website users + frappe.set_user("test2@example.com") + self.assertEqual(update_password(new_password, old_password=old_password), "/") + # reset password + update_password(old_password, old_password=new_password) + def test_password_verification(self): pass From 4a6b0e35df26edbf26f1cdee9fd4ef704f8b42cb Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Tue, 17 Aug 2021 14:06:39 +0530 Subject: [PATCH 139/306] fix: dom element for sections breaks in form tours --- frappe/public/js/frappe/form/form_tour.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/form_tour.js b/frappe/public/js/frappe/form/form_tour.js index 17547b243d..0694aa634a 100644 --- a/frappe/public/js/frappe/form/form_tour.js +++ b/frappe/public/js/frappe/form/form_tour.js @@ -82,10 +82,16 @@ frappe.ui.form.FormTour = class FormTour { get_step(step_info, on_next) { const { name, fieldname, title, description, position, is_table_field } = step_info; + let element = `.frappe-control[data-fieldname='${fieldname}']`; + const field = this.frm.get_field(fieldname); - let element = field ? field.wrapper : `.frappe-control[data-fieldname='${fieldname}']`; + if (field) { + // wrapper for section breaks returns in a list + element = field.wrapper[0] ? field.wrapper[0] : field.wrapper; + } if (is_table_field) { + // TODO: fix wrapper for grid sections element = `.grid-row-open .frappe-control[data-fieldname='${fieldname}']`; } From ddf4bb80b88403f1fa61f05e1d0e4d06e2bb5332 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 17 Aug 2021 14:30:17 +0530 Subject: [PATCH 140/306] fix: Signup throttling for postgres --- frappe/core/doctype/user/user.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py index b33e6916f5..3f91ebe54c 100644 --- a/frappe/core/doctype/user/user.py +++ b/frappe/core/doctype/user/user.py @@ -15,7 +15,6 @@ from frappe.desk.doctype.notification_settings.notification_settings import crea from frappe.utils.user import get_system_managers from frappe.website.utils import is_signup_disabled from frappe.rate_limiter import rate_limit -from frappe.utils.background_jobs import enqueue from frappe.core.doctype.user_type.user_type import user_linked_with_permission_on_doctype @@ -757,9 +756,7 @@ def sign_up(email, full_name, redirect_to): else: return 0, _("Registered but disabled") else: - if frappe.db.sql("""select count(*) from tabUser where - HOUR(TIMEDIFF(CURRENT_TIMESTAMP, TIMESTAMP(modified)))=1""")[0][0] > 300: - + if frappe.db.get_creation_count('User', 60) > 300: frappe.respond_as_web_page(_('Temporarily Disabled'), _('Too many users signed up recently, so the registration is disabled. Please try back in an hour'), http_status_code=429) From ba369da61b395c63e7aad096a36dbff22b446c9d Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 17 Aug 2021 14:33:34 +0530 Subject: [PATCH 141/306] test: Add test case to validate user signup throttling --- frappe/core/doctype/user/test_user.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/frappe/core/doctype/user/test_user.py b/frappe/core/doctype/user/test_user.py index 72650679ae..d901bfa608 100644 --- a/frappe/core/doctype/user/test_user.py +++ b/frappe/core/doctype/user/test_user.py @@ -283,6 +283,11 @@ class TestUser(unittest.TestCase): self.assertTupleEqual(sign_up(random_user, random_user_name, "/welcome"), (0, "Registered but disabled")) + # throttle user creation + with patch.object(user_module.frappe.db, "get_creation_count", return_value=301): + self.assertRaisesRegex(frappe.exceptions.ValidationError, "Throttled", + sign_up, frappe.mock('email'), random_user_name, "/signup") + def test_reset_password(self): from frappe.utils import set_request From d41121643e6339a59fed3c134ec91f532cb24a76 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Tue, 17 Aug 2021 15:59:12 +0530 Subject: [PATCH 142/306] fix: broken template in password reset --- frappe/templates/emails/password_reset.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/templates/emails/password_reset.html b/frappe/templates/emails/password_reset.html index d9e38e38f2..cd0d820615 100644 --- a/frappe/templates/emails/password_reset.html +++ b/frappe/templates/emails/password_reset.html @@ -3,5 +3,5 @@

{{_("Reset your password")}}

{{_("Thank you")}},
- {{ user_fullname }} + {{ created_by }}

From b417218f1d6261478f4c7e6ef41e53633965df1f Mon Sep 17 00:00:00 2001 From: MitulDavid Date: Tue, 17 Aug 2021 19:06:01 +0530 Subject: [PATCH 143/306] test: Add support for Testing-Library queries within Cypress tests --- cypress/integration/awesome_bar.js | 14 ++++++------- cypress/integration/control_barcode.js | 6 +++--- cypress/integration/control_icon.js | 10 ++++----- cypress/integration/control_link.js | 4 ++-- cypress/integration/control_select.js | 2 ++ cypress/integration/depends_on.js | 6 +++--- cypress/integration/file_uploader.js | 29 +++++++++++++------------- cypress/support/commands.js | 1 + frappe/commands/utils.py | 4 +++- 9 files changed, 41 insertions(+), 35 deletions(-) diff --git a/cypress/integration/awesome_bar.js b/cypress/integration/awesome_bar.js index 3e12101532..08a2a71843 100644 --- a/cypress/integration/awesome_bar.js +++ b/cypress/integration/awesome_bar.js @@ -10,9 +10,9 @@ context('Awesome Bar', () => { }); it('navigates to doctype list', () => { - cy.get('#navbar-search').type('todo', { delay: 200 }); - cy.get('#navbar-search + ul').should('be.visible'); - cy.get('#navbar-search').type('{downarrow}{enter}', { delay: 100 }); + cy.findByPlaceholderText('Search or type a command (Ctrl + G)').type('todo', { delay: 200 }); + cy.findByRole('listbox').should('be.visible'); + cy.findByPlaceholderText('Search or type a command (Ctrl + G)').type('{downarrow}{enter}', { delay: 100 }); cy.get('.title-text').should('contain', 'To Do'); @@ -20,24 +20,24 @@ context('Awesome Bar', () => { }); it('find text in doctype list', () => { - cy.get('#navbar-search') + cy.findByPlaceholderText('Search or type a command (Ctrl + G)') .type('test in todo{downarrow}{enter}', { delay: 200 }); cy.get('.title-text').should('contain', 'To Do'); - cy.get('[data-original-title="Name"] > .input-with-feedback') + cy.findByPlaceholderText('Name') .should('have.value', '%test%'); }); it('navigates to new form', () => { - cy.get('#navbar-search') + cy.findByPlaceholderText('Search or type a command (Ctrl + G)') .type('new blog post{downarrow}{enter}', { delay: 200 }); cy.get('.title-text:visible').should('have.text', 'New Blog Post'); }); it('calculates math expressions', () => { - cy.get('#navbar-search') + cy.findByPlaceholderText('Search or type a command (Ctrl + G)') .type('55 + 32{downarrow}{enter}', { delay: 200 }); cy.get('.modal-title').should('contain', 'Result'); diff --git a/cypress/integration/control_barcode.js b/cypress/integration/control_barcode.js index 1df5e64f0e..51984fdbd2 100644 --- a/cypress/integration/control_barcode.js +++ b/cypress/integration/control_barcode.js @@ -20,7 +20,7 @@ context('Control Barcode', () => { it('should generate barcode on setting a value', () => { get_dialog_with_barcode().as('dialog'); - cy.get('.frappe-control[data-fieldname=barcode] input') + cy.findByRole('textbox') .focus() .type('123456789') .blur(); @@ -37,11 +37,11 @@ context('Control Barcode', () => { it('should reset when input is cleared', () => { get_dialog_with_barcode().as('dialog'); - cy.get('.frappe-control[data-fieldname=barcode] input') + cy.findByRole('textbox') .focus() .type('123456789') .blur(); - cy.get('.frappe-control[data-fieldname=barcode] input') + cy.findByRole('textbox') .clear() .blur(); cy.get('.frappe-control[data-fieldname=barcode] svg[data-barcode-value="123456789"]') diff --git a/cypress/integration/control_icon.js b/cypress/integration/control_icon.js index f92927f267..73927a15c6 100644 --- a/cypress/integration/control_icon.js +++ b/cypress/integration/control_icon.js @@ -17,17 +17,17 @@ context('Control Icon', () => { it('should set icon', () => { get_dialog_with_icon().as('dialog'); - cy.get('.frappe-control[data-fieldname=icon] input').first().click(); + cy.findByRole('textbox').first().click(); cy.get('.icon-picker .icon-wrapper[id=active]').first().click(); - cy.get('.frappe-control[data-fieldname=icon] input').first().should('have.value', 'active'); + cy.findByRole('textbox').first().should('have.value', 'active'); cy.get('@dialog').then(dialog => { let value = dialog.get_value('icon'); expect(value).to.equal('active'); }); cy.get('.icon-picker .icon-wrapper[id=resting]').first().click(); - cy.get('.frappe-control[data-fieldname=icon] input').first().should('have.value', 'resting'); + cy.findByRole('textbox').first().should('have.value', 'resting'); cy.get('@dialog').then(dialog => { let value = dialog.get_value('icon'); expect(value).to.equal('resting'); @@ -36,14 +36,14 @@ context('Control Icon', () => { it('search for icon and clear search input', () => { let search_text = 'ed'; - cy.get('.icon-picker input[type=search]').first().click().type(search_text); + cy.findByRole('searchbox').first().click().type(search_text); cy.get('.icon-section .icon-wrapper:not(.hidden)').then(i => { cy.get(`.icon-section .icon-wrapper[id*='${search_text}']`).then(icons => { expect(i.length).to.equal(icons.length); }); }); - cy.get('.icon-picker input[type=search]').clear().blur(); + cy.findByRole('searchbox').clear().blur(); cy.get('.icon-section .icon-wrapper').should('not.have.class', 'hidden'); }); diff --git a/cypress/integration/control_link.js b/cypress/integration/control_link.js index 8f9257e9c4..d2aa467af1 100644 --- a/cypress/integration/control_link.js +++ b/cypress/integration/control_link.js @@ -35,7 +35,7 @@ context('Control Link', () => { cy.wait('@search_link'); cy.get('@input').type('todo for link', { delay: 200 }); cy.wait('@search_link'); - cy.get('.frappe-control[data-fieldname=link] ul').should('be.visible'); + cy.findByRole('listbox').should('be.visible'); cy.get('.frappe-control[data-fieldname=link] input').type('{enter}', { delay: 100 }); cy.get('.frappe-control[data-fieldname=link] input').blur(); cy.get('@dialog').then(dialog => { @@ -71,7 +71,7 @@ context('Control Link', () => { cy.get('@input').type(todos[0]).blur(); cy.wait('@validate_link'); cy.get('@input').focus(); - cy.get('.frappe-control[data-fieldname=link] .link-btn') + cy.findByTitle('Open Link') .should('be.visible') .click(); cy.location('pathname').should('eq', `/app/todo/${todos[0]}`); diff --git a/cypress/integration/control_select.js b/cypress/integration/control_select.js index 0bc719b4a7..8e18d21260 100644 --- a/cypress/integration/control_select.js +++ b/cypress/integration/control_select.js @@ -24,8 +24,10 @@ context('Control Select', () => { cy.get('@control').get('.select-icon').should('exist'); cy.get('@control').get('.placeholder').should('have.css', 'display', 'block'); cy.get('@select').select('Option 1'); + cy.findByDisplayValue('Option 1').should('exist'); cy.get('@control').get('.placeholder').should('have.css', 'display', 'none'); cy.get('@select').invoke('val', ''); + cy.findByDisplayValue('Option 1').should('not.exist'); cy.get('@control').get('.placeholder').should('have.css', 'display', 'block'); diff --git a/cypress/integration/depends_on.js b/cypress/integration/depends_on.js index d33babb134..9aa6b5d89d 100644 --- a/cypress/integration/depends_on.js +++ b/cypress/integration/depends_on.js @@ -62,11 +62,11 @@ context('Depends On', () => { it('should set the field as mandatory depending on other fields value', () => { cy.new_form('Test Depends On'); cy.fill_field('test_field', 'Some Value'); - cy.get('button.primary-action').contains('Save').click(); + cy.findByRole('button', {name: 'Save'}).click(); cy.get('.msgprint-dialog .modal-title').contains('Missing Fields').should('be.visible'); cy.hide_dialog(); cy.fill_field('test_field', 'Random value'); - cy.get('button.primary-action').contains('Save').click(); + cy.findByRole('button', {name: 'Save'}).click(); cy.get('.msgprint-dialog .modal-title').contains('Missing Fields').should('not.be.visible'); }); it('should set the field as read only depending on other fields value', () => { @@ -84,7 +84,7 @@ context('Depends On', () => { cy.fill_field('dependant_field', 'Some Value'); //cy.fill_field('test_field', 'Some Other Value'); cy.get('.frappe-control[data-fieldname="child_test_depends_on_field"]').as('table'); - cy.get('@table').find('button.grid-add-row').click(); + cy.get('@table').findByRole('button', {name: 'Add Row'}).click(); cy.get('@table').find('[data-idx="1"]').as('row1'); cy.get('@row1').find('.btn-open-row').click(); cy.get('@row1').find('.form-in-grid').as('row1-form_in_grid'); diff --git a/cypress/integration/file_uploader.js b/cypress/integration/file_uploader.js index e1e232c058..3d4f92df3c 100644 --- a/cypress/integration/file_uploader.js +++ b/cypress/integration/file_uploader.js @@ -25,7 +25,7 @@ context('FileUploader', () => { cy.get_open_dialog().find('.file-name').should('contain', 'example.json'); cy.intercept('POST', '/api/method/upload_file').as('upload_file'); - cy.get_open_dialog().find('.btn-modal-primary').click(); + cy.get_open_dialog().findByRole('button', {name: 'Upload'}).click(); cy.wait('@upload_file').its('response.statusCode').should('eq', 200); cy.get('.modal:visible').should('not.exist'); }); @@ -33,11 +33,11 @@ context('FileUploader', () => { it('should accept uploaded files', () => { open_upload_dialog(); - cy.get_open_dialog().find('.btn-file-upload div:contains("Library")').click(); - cy.get('.file-filter').type('example.json'); - cy.get_open_dialog().find('.tree-label:contains("example.json")').first().click(); + cy.get_open_dialog().findByRole('button', {name: 'Library'}).click(); + cy.findByPlaceholderText('Search by filename or extension').type('example.json'); + cy.get_open_dialog().findAllByText('example.json').first().click(); cy.intercept('POST', '/api/method/upload_file').as('upload_file'); - cy.get_open_dialog().find('.btn-primary').click(); + cy.get_open_dialog().findByRole('button', {name: 'Upload'}).click(); cy.wait('@upload_file').its('response.body.message') .should('have.property', 'file_name', 'example.json'); cy.get('.modal:visible').should('not.exist'); @@ -46,10 +46,12 @@ context('FileUploader', () => { it('should accept web links', () => { open_upload_dialog(); - cy.get_open_dialog().find('.btn-file-upload div:contains("Link")').click(); - cy.get_open_dialog().find('.file-web-link input').type('https://github.com', { delay: 100, force: true }); + cy.get_open_dialog().findByRole('button', {name: 'Link'}).click(); + cy.get_open_dialog() + .findByPlaceholderText('Attach a web link') + .type('https://github.com', { delay: 100, force: true }); cy.intercept('POST', '/api/method/upload_file').as('upload_file'); - cy.get_open_dialog().find('.btn-primary').click(); + cy.get_open_dialog().findByRole('button', {name: 'Upload'}).click(); cy.wait('@upload_file').its('response.body.message') .should('have.property', 'file_url', 'https://github.com'); cy.get('.modal:visible').should('not.exist'); @@ -62,15 +64,14 @@ context('FileUploader', () => { subjectType: 'drag-n-drop', }); - cy.get_open_dialog().find('.file-name').should('contain', 'sample_image.jpg'); + cy.get_open_dialog().findAllByText('sample_image.jpg').should('exist'); cy.get_open_dialog().find('.btn-crop').first().click(); - cy.get_open_dialog().find('.image-cropper-actions > .btn-primary').should('contain', 'Crop'); - cy.get_open_dialog().find('.image-cropper-actions > .btn-primary').click(); - cy.get_open_dialog().find('.optimize-checkbox').first().should('contain', 'Optimize'); - cy.get_open_dialog().find('.optimize-checkbox').first().click(); + cy.get_open_dialog().findByRole('button', {name: 'Crop'}).click(); + cy.get_open_dialog().findAllByRole('checkbox', {name: 'Optimize'}).should('exist'); + cy.get_open_dialog().findAllByLabelText('Optimize').first().click(); cy.intercept('POST', '/api/method/upload_file').as('upload_file'); - cy.get_open_dialog().find('.btn-modal-primary').click(); + cy.get_open_dialog().findByRole('button', {name: 'Upload'}).click(); cy.wait('@upload_file').its('response.statusCode').should('eq', 200); cy.get('.modal:visible').should('not.exist'); }); diff --git a/cypress/support/commands.js b/cypress/support/commands.js index a81ba60fb0..c941652487 100644 --- a/cypress/support/commands.js +++ b/cypress/support/commands.js @@ -1,4 +1,5 @@ import 'cypress-file-upload'; +import '@testing-library/cypress/add-commands'; // *********************************************** // This example commands.js shows you how to // create various custom commands and overwrite diff --git a/frappe/commands/utils.py b/frappe/commands/utils.py index f2395ae490..ac574841fe 100644 --- a/frappe/commands/utils.py +++ b/frappe/commands/utils.py @@ -597,16 +597,18 @@ def run_ui_tests(context, app, headless=False, parallel=True, ci_build_id=None): node_bin = subprocess.getoutput("npm bin") cypress_path = "{0}/cypress".format(node_bin) plugin_path = "{0}/../cypress-file-upload".format(node_bin) + testing_library_path = f"{node_bin}/../@testing-library" # check if cypress in path...if not, install it. if not ( os.path.exists(cypress_path) and os.path.exists(plugin_path) + and os.path.exists(testing_library_path) and cint(subprocess.getoutput("npm view cypress version")[:1]) >= 6 ): # install cypress click.secho("Installing Cypress...", fg="yellow") - frappe.commands.popen("yarn add cypress@^6 cypress-file-upload@^5 --no-lockfile") + frappe.commands.popen("yarn add cypress@^6 cypress-file-upload@^5 @testing-library/cypress@^8 --no-lockfile") # run for headless mode run_or_open = 'run --browser firefox --record' if headless else 'open' From 05166f919c070fc36b34e7b79f48061fc81850dc Mon Sep 17 00:00:00 2001 From: leela Date: Tue, 17 Aug 2021 22:48:52 +0530 Subject: [PATCH 144/306] fix: rename cancelled docs patch query use backquotes in queries where column names are dynamic(To avoid query issues incase reserved keywords used as a table columns.) --- frappe/patches/v14_0/rename_cancelled_documents.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/patches/v14_0/rename_cancelled_documents.py b/frappe/patches/v14_0/rename_cancelled_documents.py index fbe49c2351..4b565d4f76 100644 --- a/frappe/patches/v14_0/rename_cancelled_documents.py +++ b/frappe/patches/v14_0/rename_cancelled_documents.py @@ -129,9 +129,9 @@ def update_linked_doctypes(doctype, cancelled_doc_names): update `tab{linked_dt}` set - {column}=CONCAT({column}, '-CANC') + `{column}`=CONCAT(`{column}`, '-CANC') where - {column} in %(cancelled_doc_names)s; + `{column}` in %(cancelled_doc_names)s; """.format(linked_dt=linked_dt, column=field), {'cancelled_doc_names': cancelled_doc_names}) else: @@ -151,9 +151,9 @@ def update_dynamic_linked_doctypes(doctype, cancelled_doc_names): update `tab{linked_dt}` set - {column}=CONCAT({column}, '-CANC') + `{column}`=CONCAT(`{column}`, '-CANC') where - {column} in %(cancelled_doc_names)s and {doctype_fieldname}=%(dt)s; + `{column}` in %(cancelled_doc_names)s and {doctype_fieldname}=%(dt)s; """.format(linked_dt=linked_dt, column=fieldname, doctype_fieldname=doctype_fieldname), {'cancelled_doc_names': cancelled_doc_names, 'dt': doctype}) else: From 604263929f91ae03a69b28b82e4d750b5e4061a9 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 18 Aug 2021 08:20:22 +0530 Subject: [PATCH 145/306] test: Add more assersions to test cases - for better coverage --- frappe/core/doctype/user/test_user.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/user/test_user.py b/frappe/core/doctype/user/test_user.py index d901bfa608..6a6ec8d2f4 100644 --- a/frappe/core/doctype/user/test_user.py +++ b/frappe/core/doctype/user/test_user.py @@ -144,7 +144,7 @@ class TestUser(unittest.TestCase): self.assertFalse(frappe.db.exists('User', new_user.name)) def test_password_strength(self): - # Test Password without Password Strenth Policy + # Test Password without Password Strength Policy frappe.db.set_value("System Settings", "System Settings", "enable_password_policy", 0) # password policy is disabled, test_password_strength should be ignored @@ -163,6 +163,17 @@ class TestUser(unittest.TestCase): result = test_password_strength("Eastern_43A1W") self.assertEqual(result['feedback']['password_policy_validation_passed'], True) + + # test password strength while saving user with new password + user = frappe.get_doc("User", "test@example.com") + frappe.flags.in_test = False + user.new_password = "password" + self.assertRaisesRegex(frappe.exceptions.ValidationError, "Invalid Password", user.save) + user.reload() + user.new_password = "Eastern_43A1W" + user.save() + frappe.flags.in_test = True + def test_comment_mentions(self): comment = ''' @@ -215,7 +226,10 @@ class TestUser(unittest.TestCase): Testing comment for @Team - + and + + @Unknown Team + please check
''' From d1c63a4b54356505262be88cca5dda990df3a920 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 18 Aug 2021 08:22:48 +0530 Subject: [PATCH 146/306] refactor: Move code to appropriate location - update_roles had no use in user.py so moved it to role_profile.py where it is actually used --- frappe/core/doctype/role_profile/role_profile.py | 9 +++++++-- frappe/core/doctype/user/user.py | 9 --------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/frappe/core/doctype/role_profile/role_profile.py b/frappe/core/doctype/role_profile/role_profile.py index 0f58da5b5e..986cf834eb 100644 --- a/frappe/core/doctype/role_profile/role_profile.py +++ b/frappe/core/doctype/role_profile/role_profile.py @@ -3,6 +3,7 @@ # For license information, please see license.txt from frappe.model.document import Document +import frappe class RoleProfile(Document): def autoname(self): @@ -11,5 +12,9 @@ class RoleProfile(Document): def on_update(self): """ Changes in role_profile reflected across all its user """ - from frappe.core.doctype.user.user import update_roles - update_roles(self.name) + users = frappe.get_all('User', filters={'role_profile_name': self.name}) + roles = [role.role for role in self.roles] + for d in users: + user = frappe.get_doc('User', d) + user.set('roles', []) + user.add_roles(*roles) diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py index 3f91ebe54c..1336f6eab7 100644 --- a/frappe/core/doctype/user/user.py +++ b/frappe/core/doctype/user/user.py @@ -966,15 +966,6 @@ def get_module_profile(module_profile): module_profile = frappe.get_doc('Module Profile', {'module_profile_name': module_profile}) return module_profile.get('block_modules') -def update_roles(role_profile): - users = frappe.get_all('User', filters={'role_profile_name': role_profile}) - role_profile = frappe.get_doc('Role Profile', role_profile) - roles = [role.role for role in role_profile.roles] - for d in users: - user = frappe.get_doc('User', d) - user.set('roles', []) - user.add_roles(*roles) - def create_contact(user, ignore_links=False, ignore_mandatory=False): from frappe.contacts.doctype.contact.contact import get_contact_name if user.name in ["Administrator", "Guest"]: return From 7217277394cbc5d677463a9564af12bf3a1cc073 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 18 Aug 2021 09:03:03 +0530 Subject: [PATCH 147/306] test: Fix flaky test --- frappe/core/doctype/user/test_user.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/user/test_user.py b/frappe/core/doctype/user/test_user.py index 6a6ec8d2f4..1ce22e758c 100644 --- a/frappe/core/doctype/user/test_user.py +++ b/frappe/core/doctype/user/test_user.py @@ -317,8 +317,9 @@ class TestUser(unittest.TestCase): frappe.set_user("test@example.com") test_user = frappe.get_doc("User", "test@example.com") test_user.reset_password() - frappe.cache().hset('redirect_after_login', test_user.email, "/some_portal_page") - self.assertEqual(update_password(new_password, key=test_user.reset_password_key), "/app") + pwd_key = test_user.reset_password_key + test_user.reload() + self.assertEqual(update_password(new_password, key=pwd_key), "/app") self.assertEqual(update_password(new_password, key="wrong_key"), "The Link specified has either been used before or Invalid") # password verification should fail with old password @@ -347,6 +348,7 @@ class TestUser(unittest.TestCase): self.assertEqual(update_password(new_password, old_password=old_password), "/") # reset password update_password(old_password, old_password=new_password) + frappe.set_user("Administrator") def test_password_verification(self): From 093c72e9635b8f0060645812871a3d5b98e4c384 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 18 Aug 2021 09:04:01 +0530 Subject: [PATCH 148/306] test: Update role profile test case with more assertions --- .../doctype/role_profile/test_role_profile.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/frappe/core/doctype/role_profile/test_role_profile.py b/frappe/core/doctype/role_profile/test_role_profile.py index 53e0a1b043..57b77d868b 100644 --- a/frappe/core/doctype/role_profile/test_role_profile.py +++ b/frappe/core/doctype/role_profile/test_role_profile.py @@ -8,6 +8,7 @@ test_dependencies = ['Role'] class TestRoleProfile(unittest.TestCase): def test_make_new_role_profile(self): + frappe.delete_doc_if_exists('Role Profile', 'Test 1', force=1) new_role_profile = frappe.get_doc(dict(doctype='Role Profile', role_profile='Test 1')).insert() self.assertEqual(new_role_profile.role_profile, 'Test 1') @@ -19,7 +20,25 @@ class TestRoleProfile(unittest.TestCase): new_role_profile.save() self.assertEqual(new_role_profile.roles[0].role, '_Test Role 2') + # user with a role profile + random_user = frappe.mock("email") + random_user_name = frappe.mock("name") + + random_user = frappe.get_doc({ + "doctype": "User", + "email": random_user, + "enabled": 1, + "first_name": random_user_name, + "new_password": "Eastern_43A1W", + "role_profile_name": 'Test 1' + }).insert(ignore_permissions=True, ignore_if_duplicate=True) + self.assertListEqual([role.role for role in random_user.roles], [role.role for role in new_role_profile.roles]) + # clear roles new_role_profile.roles = [] new_role_profile.save() self.assertEqual(new_role_profile.roles, []) + + # user roles with the role profile should also be updated + random_user.reload() + self.assertListEqual(random_user.roles, []) \ No newline at end of file From fe15028df3fa527dc0029678a1697232000cbb36 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 18 Aug 2021 10:20:08 +0530 Subject: [PATCH 149/306] test: Fix reset password test --- frappe/core/doctype/user/test_records.json | 16 +++++++++++++++- frappe/core/doctype/user/test_user.py | 8 +++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/frappe/core/doctype/user/test_records.json b/frappe/core/doctype/user/test_records.json index f9033d4660..21fe3ff69d 100644 --- a/frappe/core/doctype/user/test_records.json +++ b/frappe/core/doctype/user/test_records.json @@ -70,5 +70,19 @@ "role": "System Manager" } ] - } + }, + { + "doctype": "User", + "email": "testpassword@example.com", + "enabled": 1, + "first_name": "_Test", + "new_password": "Eastern_43A1W", + "roles": [ + { + "doctype": "Has Role", + "parentfield": "roles", + "role": "System Manager" + } + ] + } ] diff --git a/frappe/core/doctype/user/test_user.py b/frappe/core/doctype/user/test_user.py index 1ce22e758c..6534e70235 100644 --- a/frappe/core/doctype/user/test_user.py +++ b/frappe/core/doctype/user/test_user.py @@ -314,12 +314,10 @@ class TestUser(unittest.TestCase): frappe.local.cookie_manager = CookieManager() frappe.local.login_manager = LoginManager() - frappe.set_user("test@example.com") - test_user = frappe.get_doc("User", "test@example.com") + frappe.set_user("testpassword@example.com") + test_user = frappe.get_doc("User", "testpassword@example.com") test_user.reset_password() - pwd_key = test_user.reset_password_key - test_user.reload() - self.assertEqual(update_password(new_password, key=pwd_key), "/app") + self.assertEqual(update_password(new_password, key=test_user.reset_password_key), "/app") self.assertEqual(update_password(new_password, key="wrong_key"), "The Link specified has either been used before or Invalid") # password verification should fail with old password From 3fd60b70eeec03b29d426407a3202d111bef7658 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Wed, 18 Aug 2021 11:42:44 +0530 Subject: [PATCH 150/306] fix: Length change for docfield not updated in Database --- frappe/custom/doctype/customize_form/customize_form.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/frappe/custom/doctype/customize_form/customize_form.py b/frappe/custom/doctype/customize_form/customize_form.py index 8de194fb00..94f25a41aa 100644 --- a/frappe/custom/doctype/customize_form/customize_form.py +++ b/frappe/custom/doctype/customize_form/customize_form.py @@ -193,6 +193,16 @@ class CustomizeForm(Document): if prop == "fieldtype": self.validate_fieldtype_change(df, meta_df[0].get(prop), df.get(prop)) + elif prop == "length": + old_value_length = cint(meta_df[0].get(prop)) + new_value_length = cint(df.get(prop)) + + if new_value_length and (old_value_length > new_value_length): + self.check_length_for_fieldtypes.append({'df': df, 'old_value': meta_df[0].get(prop)}) + self.validate_fieldtype_length() + else: + self.flags.update_db = True + elif prop == "allow_on_submit" and df.get(prop): if not frappe.db.get_value("DocField", {"parent": self.doc_type, "fieldname": df.fieldname}, "allow_on_submit"): From cf67f9d28332ca139d1607108688f52c86941226 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 18 Aug 2021 12:01:44 +0530 Subject: [PATCH 151/306] fix(minor): remove url from metatags --- frappe/website/website_components/metatags.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/frappe/website/website_components/metatags.py b/frappe/website/website_components/metatags.py index 045bef8fe1..e26098b773 100644 --- a/frappe/website/website_components/metatags.py +++ b/frappe/website/website_components/metatags.py @@ -1,5 +1,7 @@ import frappe +METATAGS = ('title', 'description', 'image', 'author', 'published_on') + class MetaTags(): def __init__(self, path, context): self.path = path @@ -12,7 +14,7 @@ class MetaTags(): self.set_metatags_from_website_route_meta() def init_metatags_from_context(self): - for key in ('title', 'description', 'image', 'author', 'url', 'published_on'): + for key in METATAGS: if key not in self.tags and self.context.get(key): self.tags[key] = self.context[key] @@ -28,12 +30,12 @@ class MetaTags(): if "og:type" not in self.tags: self.tags["og:type"] = "article" - for key in ('title', 'description', 'image', 'author', 'url'): + for key in METATAGS: if self.tags.get(key): self.tags['og:' + key] = self.tags.get(key) def set_twitter_tags(self): - for key in ('title', 'description', 'image', 'author', 'url'): + for key in METATAGS: if self.tags.get(key): self.tags['twitter:' + key] = self.tags.get(key) From 68b9ae808bf9e1eeed29b7f5eba8f074a6e53014 Mon Sep 17 00:00:00 2001 From: hasnain2808 Date: Wed, 18 Aug 2021 12:35:05 +0530 Subject: [PATCH 152/306] feat: maxLines in ace editor --- frappe/public/js/frappe/form/controls/code.js | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/frappe/public/js/frappe/form/controls/code.js b/frappe/public/js/frappe/form/controls/code.js index 5af7cf2863..29749a8a27 100644 --- a/frappe/public/js/frappe/form/controls/code.js +++ b/frappe/public/js/frappe/form/controls/code.js @@ -9,12 +9,7 @@ frappe.ui.form.ControlCode = class ControlCode extends frappe.ui.form.ControlTex this.ace_editor_target = $('
') .appendTo(this.input_area); - this.expanded = false; - this.$expand_button = $(``).click(() => { - this.expanded = !this.expanded; - this.refresh_height(); - this.toggle_label(); - }).appendTo(this.$input_wrapper); + // styling this.ace_editor_target.addClass('border rounded'); this.ace_editor_target.css('height', 300); @@ -22,6 +17,18 @@ frappe.ui.form.ControlCode = class ControlCode extends frappe.ui.form.ControlTex // initialize const ace = window.ace; this.editor = ace.edit(this.ace_editor_target.get(0)); + + if (this.df.maxLines) + this.editor.setOption("maxLines", this.df.maxLines); + else{ + this.expanded = false; + this.$expand_button = $(``).click(() => { + this.expanded = !this.expanded; + this.refresh_height(); + this.toggle_label(); + }).appendTo(this.$input_wrapper); + } + this.editor.setTheme('ace/theme/tomorrow'); this.editor.setOption("showPrintMargin", false); this.editor.setOption("wrap", this.df.wrap); From 3baa33d5da5b797587ba249e4ed723eba2242a3f Mon Sep 17 00:00:00 2001 From: Shariq Ansari <30859809+shariquerik@users.noreply.github.com> Date: Wed, 18 Aug 2021 13:21:10 +0530 Subject: [PATCH 153/306] fix: Use IP Address instead of Email field (#13553) --- frappe/core/doctype/feedback/feedback.json | 17 +++++++------- frappe/core/doctype/feedback/test_feedback.py | 4 ++-- .../templates/includes/feedback/feedback.html | 16 +++++--------- .../templates/includes/feedback/feedback.py | 22 ++++++++++++++----- frappe/website/doctype/blog_post/blog_post.py | 7 ++++-- 5 files changed, 38 insertions(+), 28 deletions(-) diff --git a/frappe/core/doctype/feedback/feedback.json b/frappe/core/doctype/feedback/feedback.json index cf8a180e27..b77e7a6677 100644 --- a/frappe/core/doctype/feedback/feedback.json +++ b/frappe/core/doctype/feedback/feedback.json @@ -8,8 +8,8 @@ "reference_doctype", "reference_name", "column_break_3", - "email", "rating", + "ip_address", "section_break_6", "feedback" ], @@ -18,12 +18,6 @@ "fieldname": "column_break_3", "fieldtype": "Column Break" }, - { - "fieldname": "email", - "fieldtype": "Data", - "label": "Email", - "reqd": 1 - }, { "fieldname": "rating", "fieldtype": "Float", @@ -56,11 +50,18 @@ "label": "Reference Name", "options": "reference_doctype", "reqd": 1 + }, + { + "fieldname": "ip_address", + "fieldtype": "Data", + "hidden": 1, + "label": "IP Address", + "read_only": 1 } ], "index_web_pages_for_search": 1, "links": [], - "modified": "2021-06-14 15:11:26.005805", + "modified": "2021-06-23 12:45:42.045696", "modified_by": "Administrator", "module": "Core", "name": "Feedback", diff --git a/frappe/core/doctype/feedback/test_feedback.py b/frappe/core/doctype/feedback/test_feedback.py index 702f9d8ac1..2a96d86874 100644 --- a/frappe/core/doctype/feedback/test_feedback.py +++ b/frappe/core/doctype/feedback/test_feedback.py @@ -12,12 +12,12 @@ class TestFeedback(unittest.TestCase): frappe.db.sql("delete from `tabFeedback` where reference_doctype = 'Blog Post'") from frappe.templates.includes.feedback.feedback import add_feedback, update_feedback - feedback = add_feedback('Blog Post', test_blog.name, 5, 'New feedback','test@test.com') + feedback = add_feedback('Blog Post', test_blog.name, 5, 'New feedback') self.assertEqual(feedback.feedback, 'New feedback') self.assertEqual(feedback.rating, 5) - updated_feedback = update_feedback('Blog Post', test_blog.name, 6, 'Updated feedback', 'test@test.com') + updated_feedback = update_feedback('Blog Post', test_blog.name, 6, 'Updated feedback') self.assertEqual(updated_feedback.feedback, 'Updated feedback') self.assertEqual(updated_feedback.rating, 6) diff --git a/frappe/templates/includes/feedback/feedback.html b/frappe/templates/includes/feedback/feedback.html index 55d44e95fb..f180fa5e42 100644 --- a/frappe/templates/includes/feedback/feedback.html +++ b/frappe/templates/includes/feedback/feedback.html @@ -7,9 +7,6 @@
-
- -
{% for rating in [1, 2, 3, 4, 5 ,6, 7, 8, 9, 10] %} @@ -41,7 +38,6 @@ feedback && $("#submit-feedback").html(__("Update")); if (frappe.is_user_logged_in()) { - $(".feedback_email").parent().toggleClass("hidden"); if (feedback) { $("[name='feedback']").val(feedback); toggle_feedback(); @@ -83,12 +79,12 @@ $('#submit-feedback').click((ev) => { let update = ev.target.innerText !== __("Submit"); + let rating = $('.rating').find('.rating-click').length; let args = { reference_doctype: "{{ reference_doctype or doctype }}", reference_name: "{{ reference_name or name }}", rating: rating, - feedback: $("[name='feedback']").val(), - feedback_email: $("[name='feedback_email']").val() || frappe.user_id + feedback: $("[name='feedback']").val() } if (args.rating == 0) { @@ -101,16 +97,14 @@ return false; } - if (args.feedback_email!=='Administrator' && !validate_email(args.feedback_email)) { - frappe.msgprint("{{ _("Please enter a valid email address.") }}"); - return false; - } - if (!update) { frappe.call({ method: "frappe.templates.includes.feedback.feedback.add_feedback", args: args, callback: function(r) { + if (!r.message) { + return + } toggle_feedback(); if (!frappe.is_user_logged_in()) { $("[name='feedback']").val(''); diff --git a/frappe/templates/includes/feedback/feedback.py b/frappe/templates/includes/feedback/feedback.py index 1830a3e09e..b15d9567d7 100644 --- a/frappe/templates/includes/feedback/feedback.py +++ b/frappe/templates/includes/feedback/feedback.py @@ -3,21 +3,33 @@ from __future__ import unicode_literals import frappe +from frappe.utils import add_to_date, now from frappe import _ @frappe.whitelist(allow_guest=True) -def add_feedback(reference_doctype, reference_name, rating, feedback, feedback_email): +def add_feedback(reference_doctype, reference_name, rating, feedback): doc = frappe.get_doc(reference_doctype, reference_name) if doc.disable_feedback == 1: return + feedback_count = frappe.db.count("Feedback", { + "reference_doctype": reference_doctype, + "reference_name": reference_name, + "ip_address": frappe.local.request_ip, + "creation": (">", add_to_date(now(), hours=-1)) + }) + + if feedback_count > 20: + frappe.msgprint(_('Hourly feedback limit reached')) + return + doc = frappe.new_doc('Feedback') doc.reference_doctype = reference_doctype doc.reference_name = reference_name doc.rating = rating doc.feedback = feedback - doc.email = feedback_email + doc.ip_address = frappe.local.request_ip doc.save(ignore_permissions=True) subject = _('New Feedback on {0}: {1}').format(reference_doctype, reference_name) @@ -25,13 +37,13 @@ def add_feedback(reference_doctype, reference_name, rating, feedback, feedback_e return doc @frappe.whitelist() -def update_feedback(reference_doctype, reference_name, rating, feedback, feedback_email): +def update_feedback(reference_doctype, reference_name, rating, feedback): doc = frappe.get_doc(reference_doctype, reference_name) if doc.disable_feedback == 1: return filters = { - "email": feedback_email, + "owner": frappe.session.user, "reference_doctype": reference_doctype, "reference_name": reference_name } @@ -49,7 +61,7 @@ def send_mail(feedback, subject): doc = frappe.get_doc(feedback.reference_doctype, feedback.reference_name) message = ("

{0} ({1})

".format(feedback.feedback, feedback.rating) - + "

{2}

".format(frappe.utils.get_request_site_address(), + + "

{2}

".format(frappe.utils.get_request_site_address(), feedback.name, _("View Feedback"))) diff --git a/frappe/website/doctype/blog_post/blog_post.py b/frappe/website/doctype/blog_post/blog_post.py index 965fc8e3e0..cb887a2ffc 100644 --- a/frappe/website/doctype/blog_post/blog_post.py +++ b/frappe/website/doctype/blog_post/blog_post.py @@ -147,12 +147,15 @@ class BlogPost(WebsiteGenerator): context.comment_text = _('{0} comments').format(len(context.comment_list)) def load_feedback(self, context): + user = frappe.session.user + if user == 'Guest': + user = '' feedback = frappe.get_all('Feedback', - fields=['email', 'feedback', 'rating'], + fields=['feedback', 'rating'], filters=dict( reference_doctype=self.doctype, reference_name=self.name, - email=frappe.session.user + owner=user ) ) context.user_feedback = feedback[0] if feedback else '' From f3e0a30ec78bd7a3cfbe2690e137597a61c3f6ec Mon Sep 17 00:00:00 2001 From: Mohammad Hasnain Mohsin Rajan Date: Wed, 18 Aug 2021 13:55:33 +0530 Subject: [PATCH 154/306] style: add space after else keyword --- frappe/public/js/frappe/form/controls/code.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/controls/code.js b/frappe/public/js/frappe/form/controls/code.js index 29749a8a27..b5653a68a7 100644 --- a/frappe/public/js/frappe/form/controls/code.js +++ b/frappe/public/js/frappe/form/controls/code.js @@ -20,7 +20,7 @@ frappe.ui.form.ControlCode = class ControlCode extends frappe.ui.form.ControlTex if (this.df.maxLines) this.editor.setOption("maxLines", this.df.maxLines); - else{ + else { this.expanded = false; this.$expand_button = $(``).click(() => { this.expanded = !this.expanded; From 03c975a1f1ea59eeb38818427954c90240d8b886 Mon Sep 17 00:00:00 2001 From: Mohammad Hasnain Mohsin Rajan Date: Wed, 18 Aug 2021 14:03:22 +0530 Subject: [PATCH 155/306] fix: use snake case Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> --- frappe/public/js/frappe/form/controls/code.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/controls/code.js b/frappe/public/js/frappe/form/controls/code.js index b5653a68a7..0f0565cf3e 100644 --- a/frappe/public/js/frappe/form/controls/code.js +++ b/frappe/public/js/frappe/form/controls/code.js @@ -19,7 +19,7 @@ frappe.ui.form.ControlCode = class ControlCode extends frappe.ui.form.ControlTex this.editor = ace.edit(this.ace_editor_target.get(0)); if (this.df.maxLines) - this.editor.setOption("maxLines", this.df.maxLines); + this.editor.setOption("maxLines", this.df.max_lines); else { this.expanded = false; this.$expand_button = $(``).click(() => { From 6da11e7a2640f1b42bb540530a5be05c872085cb Mon Sep 17 00:00:00 2001 From: hasnain2808 Date: Wed, 18 Aug 2021 14:06:11 +0530 Subject: [PATCH 156/306] fix: use snake case --- frappe/public/js/frappe/form/controls/code.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/controls/code.js b/frappe/public/js/frappe/form/controls/code.js index 0f0565cf3e..210bf57839 100644 --- a/frappe/public/js/frappe/form/controls/code.js +++ b/frappe/public/js/frappe/form/controls/code.js @@ -18,7 +18,7 @@ frappe.ui.form.ControlCode = class ControlCode extends frappe.ui.form.ControlTex const ace = window.ace; this.editor = ace.edit(this.ace_editor_target.get(0)); - if (this.df.maxLines) + if (this.df.max_lines) this.editor.setOption("maxLines", this.df.max_lines); else { this.expanded = false; From 93198b7123efde04c0251e75c34c250e3bca4ee4 Mon Sep 17 00:00:00 2001 From: MitulDavid Date: Wed, 18 Aug 2021 19:11:01 +0530 Subject: [PATCH 157/306] test: Replace existing queries with Testing-Library queries --- cypress/integration/awesome_bar.js | 2 +- cypress/integration/control_barcode.js | 6 ++-- cypress/integration/control_icon.js | 10 +++--- cypress/integration/control_link.js | 2 +- cypress/integration/form.js | 2 +- cypress/integration/form_tour.js | 16 ++++----- cypress/integration/grid_pagination.js | 4 +-- cypress/integration/list_view_settings.js | 12 +++---- cypress/integration/login.js | 12 +++---- cypress/integration/recorder.js | 16 ++++----- cypress/integration/report_view.js | 2 +- cypress/integration/timeline.js | 40 +++++++++++------------ 12 files changed, 62 insertions(+), 62 deletions(-) diff --git a/cypress/integration/awesome_bar.js b/cypress/integration/awesome_bar.js index 08a2a71843..fb09b384a8 100644 --- a/cypress/integration/awesome_bar.js +++ b/cypress/integration/awesome_bar.js @@ -11,7 +11,7 @@ context('Awesome Bar', () => { it('navigates to doctype list', () => { cy.findByPlaceholderText('Search or type a command (Ctrl + G)').type('todo', { delay: 200 }); - cy.findByRole('listbox').should('be.visible'); + cy.get('.awesomplete').findByRole('listbox').should('be.visible'); cy.findByPlaceholderText('Search or type a command (Ctrl + G)').type('{downarrow}{enter}', { delay: 100 }); cy.get('.title-text').should('contain', 'To Do'); diff --git a/cypress/integration/control_barcode.js b/cypress/integration/control_barcode.js index 51984fdbd2..5f1ab86d41 100644 --- a/cypress/integration/control_barcode.js +++ b/cypress/integration/control_barcode.js @@ -20,7 +20,7 @@ context('Control Barcode', () => { it('should generate barcode on setting a value', () => { get_dialog_with_barcode().as('dialog'); - cy.findByRole('textbox') + cy.get('.frappe-control[data-fieldname=barcode]').findByRole('textbox') .focus() .type('123456789') .blur(); @@ -37,11 +37,11 @@ context('Control Barcode', () => { it('should reset when input is cleared', () => { get_dialog_with_barcode().as('dialog'); - cy.findByRole('textbox') + cy.get('.frappe-control[data-fieldname=barcode]').findByRole('textbox') .focus() .type('123456789') .blur(); - cy.findByRole('textbox') + cy.get('.frappe-control[data-fieldname=barcode]').findByRole('textbox') .clear() .blur(); cy.get('.frappe-control[data-fieldname=barcode] svg[data-barcode-value="123456789"]') diff --git a/cypress/integration/control_icon.js b/cypress/integration/control_icon.js index 73927a15c6..5c531a0823 100644 --- a/cypress/integration/control_icon.js +++ b/cypress/integration/control_icon.js @@ -17,17 +17,17 @@ context('Control Icon', () => { it('should set icon', () => { get_dialog_with_icon().as('dialog'); - cy.findByRole('textbox').first().click(); + cy.get('.frappe-control[data-fieldname=icon]').findByRole('textbox').click(); cy.get('.icon-picker .icon-wrapper[id=active]').first().click(); - cy.findByRole('textbox').first().should('have.value', 'active'); + cy.get('.frappe-control[data-fieldname=icon]').findByRole('textbox').should('have.value', 'active'); cy.get('@dialog').then(dialog => { let value = dialog.get_value('icon'); expect(value).to.equal('active'); }); cy.get('.icon-picker .icon-wrapper[id=resting]').first().click(); - cy.findByRole('textbox').first().should('have.value', 'resting'); + cy.get('.frappe-control[data-fieldname=icon]').findByRole('textbox').should('have.value', 'resting'); cy.get('@dialog').then(dialog => { let value = dialog.get_value('icon'); expect(value).to.equal('resting'); @@ -36,14 +36,14 @@ context('Control Icon', () => { it('search for icon and clear search input', () => { let search_text = 'ed'; - cy.findByRole('searchbox').first().click().type(search_text); + cy.get('.icon-picker').findByRole('searchbox').click().type(search_text); cy.get('.icon-section .icon-wrapper:not(.hidden)').then(i => { cy.get(`.icon-section .icon-wrapper[id*='${search_text}']`).then(icons => { expect(i.length).to.equal(icons.length); }); }); - cy.findByRole('searchbox').clear().blur(); + cy.get('.icon-picker').findByRole('searchbox').clear().blur(); cy.get('.icon-section .icon-wrapper').should('not.have.class', 'hidden'); }); diff --git a/cypress/integration/control_link.js b/cypress/integration/control_link.js index d2aa467af1..7d44a71d06 100644 --- a/cypress/integration/control_link.js +++ b/cypress/integration/control_link.js @@ -35,7 +35,7 @@ context('Control Link', () => { cy.wait('@search_link'); cy.get('@input').type('todo for link', { delay: 200 }); cy.wait('@search_link'); - cy.findByRole('listbox').should('be.visible'); + cy.get('.frappe-control[data-fieldname=link]').findByRole('listbox').should('be.visible'); cy.get('.frappe-control[data-fieldname=link] input').type('{enter}', { delay: 100 }); cy.get('.frappe-control[data-fieldname=link] input').blur(); cy.get('@dialog').then(dialog => { diff --git a/cypress/integration/form.js b/cypress/integration/form.js index 909955c1df..d20750b1d5 100644 --- a/cypress/integration/form.js +++ b/cypress/integration/form.js @@ -26,7 +26,7 @@ context('Form', () => { cy.visit('/app/contact'); cy.add_filter(); cy.get('.filter-field .input-with-feedback.form-control').type('123', { force: true }); - cy.get('.filter-popover .apply-filters').click({ force: true }); + cy.findByRole('button', {name: 'Apply Filters'}).click({ force: true }); cy.visit('/app/contact/Test Form Contact 3'); cy.get('.prev-doc').should('be.visible').click(); cy.get('.msgprint-dialog .modal-body').contains('No further records').should('be.visible'); diff --git a/cypress/integration/form_tour.js b/cypress/integration/form_tour.js index d12be63f3b..d2d39679a8 100644 --- a/cypress/integration/form_tour.js +++ b/cypress/integration/form_tour.js @@ -9,7 +9,7 @@ context('Form Tour', () => { const open_test_form_tour = () => { cy.visit('/app/form-tour/Test Form Tour'); - cy.get('button[data-label="Show%20Tour"]').should('be.visible').and('contain', 'Show Tour').as('show_tour'); + cy.findByRole('button', {name: 'Show Tour'}).should('be.visible').as('show_tour'); cy.get('@show_tour').click(); cy.wait(500); cy.url().should('include', '/app/contact'); @@ -23,7 +23,7 @@ context('Form Tour', () => { cy.get('#driver-popover-item').should('be.visible'); cy.get('.frappe-control[data-fieldname="first_name"]').as('first_name'); cy.get('@first_name').should('have.class', 'driver-highlighted-element'); - cy.get('.driver-next-btn').as('next_btn'); + cy.get('#driver-popover-item').findByRole('button', {name: 'Next'}).as('next_btn'); // next btn shouldn't move to next step, if first name is not entered cy.get('@next_btn').click(); @@ -39,7 +39,7 @@ context('Form Tour', () => { // assert field is highlighted cy.get('.frappe-control[data-fieldname="last_name"]').as('last_name'); cy.get('@last_name').should('have.class', 'driver-highlighted-element'); - + // after filling the field, next step should be highlighted cy.fill_field('last_name', 'Test Last Name', 'Data'); cy.wait(500); @@ -49,12 +49,12 @@ context('Form Tour', () => { // assert field is highlighted cy.get('.frappe-control[data-fieldname="phone_nos"]').as('phone_nos'); cy.get('@phone_nos').should('have.class', 'driver-highlighted-element'); - + // move to next step cy.wait(500); cy.get('@next_btn').click(); cy.wait(500); - + // assert add row btn is highlighted cy.get('@phone_nos').find('.grid-add-row').as('add_row'); cy.get('@add_row').should('have.class', 'driver-highlighted-element'); @@ -78,11 +78,11 @@ context('Form Tour', () => { // collapse row cy.get('.grid-row-open .grid-collapse-row').click(); cy.wait(500); - + // assert save btn is highlighted cy.get('.primary-action').should('have.class', 'driver-highlighted-element'); - cy.get('@next_btn').should('contain', 'Save'); + cy.wait(500); + cy.get('#driver-popover-item').findByRole('button', {name: 'Save'}).should('be.visible'); }); }); - \ No newline at end of file diff --git a/cypress/integration/grid_pagination.js b/cypress/integration/grid_pagination.js index 8f6b79c1f4..c07230d2b8 100644 --- a/cypress/integration/grid_pagination.js +++ b/cypress/integration/grid_pagination.js @@ -30,12 +30,12 @@ context('Grid Pagination', () => { it('adds and deletes rows and changes page', () => { cy.visit('/app/contact/Test Contact'); cy.get('.frappe-control[data-fieldname="phone_nos"]').as('table'); - cy.get('@table').find('button.grid-add-row').click(); + cy.get('@table').findByRole('button', {name: 'Add Row'}).click(); cy.get('@table').find('.grid-body .row-index').should('contain', 1001); cy.get('@table').find('.current-page-number').should('contain', '21'); cy.get('@table').find('.total-page-number').should('contain', '21'); cy.get('@table').find('.grid-body .grid-row .grid-row-check').click({ force: true }); - cy.get('@table').find('button.grid-remove-rows').click(); + cy.get('@table').findByRole('button', {name: 'Delete'}).click(); cy.get('@table').find('.grid-body .row-index').last().should('contain', 1000); cy.get('@table').find('.current-page-number').should('contain', '20'); cy.get('@table').find('.total-page-number').should('contain', '20'); diff --git a/cypress/integration/list_view_settings.js b/cypress/integration/list_view_settings.js index 52512b911e..61d4b8aae5 100644 --- a/cypress/integration/list_view_settings.js +++ b/cypress/integration/list_view_settings.js @@ -17,9 +17,9 @@ context('List View Settings', () => { cy.get('.dropdown-menu li').filter(':visible').contains('List Settings').click(); cy.get('.modal-dialog').should('contain', 'DocType Settings'); - cy.get('input[data-fieldname="disable_count"]').check({ force: true }); - cy.get('input[data-fieldname="disable_sidebar_stats"]').check({ force: true }); - cy.get('button').filter(':visible').contains('Save').click(); + cy.findByLabelText('Disable Count').check({ force: true }); + cy.findByLabelText('Disable Sidebar Stats').check({ force: true }); + cy.findByRole('button', {name: 'Save'}).click(); cy.reload({ force: true }); @@ -29,8 +29,8 @@ context('List View Settings', () => { cy.get('.menu-btn-group button').click({ force: true }); cy.get('.dropdown-menu li').filter(':visible').contains('List Settings').click(); cy.get('.modal-dialog').should('contain', 'DocType Settings'); - cy.get('input[data-fieldname="disable_count"]').uncheck({ force: true }); - cy.get('input[data-fieldname="disable_sidebar_stats"]').uncheck({ force: true }); - cy.get('button').filter(':visible').contains('Save').click(); + cy.findByLabelText('Disable Count').uncheck({ force: true }); + cy.findByLabelText('Disable Sidebar Stats').uncheck({ force: true }); + cy.findByRole('button', {name: 'Save'}).click(); }); }); diff --git a/cypress/integration/login.js b/cypress/integration/login.js index 6b109dd18d..98739bb4c9 100644 --- a/cypress/integration/login.js +++ b/cypress/integration/login.js @@ -11,13 +11,13 @@ context('Login', () => { it('validates password', () => { cy.get('#login_email').type('Administrator'); - cy.get('.btn-login:visible').click(); + cy.findByRole('button', {name: 'Login'}).click(); cy.location('pathname').should('eq', '/login'); }); it('validates email', () => { cy.get('#login_password').type('qwe'); - cy.get('.btn-login:visible').click(); + cy.findByRole('button', {name: 'Login'}).click(); cy.location('pathname').should('eq', '/login'); }); @@ -25,8 +25,8 @@ context('Login', () => { cy.get('#login_email').type('Administrator'); cy.get('#login_password').type('qwer'); - cy.get('.btn-login:visible').click(); - cy.get('.btn-login:visible').contains('Invalid Login. Try again.'); + cy.findByRole('button', {name: 'Login'}).click(); + cy.findByRole('button', {name: 'Invalid Login. Try again.'}).should('exist'); cy.location('pathname').should('eq', '/login'); }); @@ -34,7 +34,7 @@ context('Login', () => { cy.get('#login_email').type('Administrator'); cy.get('#login_password').type(Cypress.config('adminPassword')); - cy.get('.btn-login:visible').click(); + cy.findByRole('button', {name: 'Login'}).click(); cy.location('pathname').should('eq', '/app'); cy.window().its('frappe.session.user').should('eq', 'Administrator'); }); @@ -60,7 +60,7 @@ context('Login', () => { cy.get('#login_email').type('Administrator'); cy.get('#login_password').type(Cypress.config('adminPassword')); - cy.get('.btn-login:visible').click(); + cy.findByRole('button', {name: 'Login'}).click(); // verify redirected location and url params after login cy.url().should('include', '/me?' + payload.toString().replace('+', '%20')); diff --git a/cypress/integration/recorder.js b/cypress/integration/recorder.js index 5b7692d8ff..7a62b2e6d9 100644 --- a/cypress/integration/recorder.js +++ b/cypress/integration/recorder.js @@ -16,24 +16,24 @@ context('Recorder', () => { it('Navigate to Recorder', () => { cy.visit('/app'); cy.awesomebar('recorder'); - cy.get('h3').should('contain', 'Recorder'); + cy.findByTitle('Recorder').should('exist'); cy.url().should('include', '/recorder/detail'); }); it('Recorder Empty State', () => { - cy.get('.title-text').should('contain', 'Recorder'); + cy.findByTitle('Recorder').should('exist'); cy.get('.indicator-pill').should('contain', 'Inactive').should('have.class', 'red'); - cy.get('.primary-action').should('contain', 'Start'); - cy.get('.btn-secondary').should('contain', 'Clear'); + cy.findByRole('button', {name: 'Start'}).should('exist'); + cy.findByRole('button', {name: 'Clear'}).should('exist'); cy.get('.msg-box').should('contain', 'Inactive'); - cy.get('.msg-box .btn-primary').should('contain', 'Start Recording'); + cy.findByRole('button', {name: 'Start Recording'}).should('exist'); }); it('Recorder Start', () => { - cy.get('.primary-action').should('contain', 'Start').click(); + cy.findByRole('button', {name: 'Start'}).click(); cy.get('.indicator-pill').should('contain', 'Active').should('have.class', 'green'); cy.get('.msg-box').should('contain', 'No Requests'); @@ -46,12 +46,12 @@ context('Recorder', () => { cy.get('.list-count').should('contain', '20 of '); cy.visit('/app/recorder'); - cy.get('.title-text').should('contain', 'Recorder'); + cy.findByTitle('Recorder').should('exist'); cy.get('.result-list').should('contain', '/api/method/frappe.desk.reportview.get'); }); it('Recorder View Request', () => { - cy.get('.primary-action').should('contain', 'Start').click(); + cy.findByRole('button', {name: 'Start'}).click(); cy.visit('/app/List/DocType/List'); cy.intercept('POST', '/api/method/frappe.desk.reportview.get').as('list_refresh'); diff --git a/cypress/integration/report_view.js b/cypress/integration/report_view.js index ea76246ae2..e762eebea1 100644 --- a/cypress/integration/report_view.js +++ b/cypress/integration/report_view.js @@ -23,7 +23,7 @@ context('Report View', () => { let cell = cy.get('.dt-row-0 > .dt-cell--col-4'); // select the cell cell.dblclick(); - cell.find('input[data-fieldname="enabled"]').check({ force: true }); + cell.findByRole('checkbox').check({ force: true }); cy.get('.dt-row-0 > .dt-cell--col-5').click(); cy.wait('@value-update'); cy.get('@doc').then(doc => { diff --git a/cypress/integration/timeline.js b/cypress/integration/timeline.js index c7bbe29e5a..7a8f3a159b 100644 --- a/cypress/integration/timeline.js +++ b/cypress/integration/timeline.js @@ -10,26 +10,26 @@ context('Timeline', () => { it('Adding new ToDo, adding new comment, verifying comment addition & deletion and deleting ToDo', () => { //Adding new ToDo cy.click_listview_primary_button('Add ToDo'); - cy.get('.modal-footer > .custom-actions > .btn').contains('Edit in full page').click(); - cy.get('.row > .section-body > .form-column > form > .frappe-control > .form-group > .control-input-wrapper > .control-input > .ql-container > .ql-editor').eq(0).type('Test ToDo', {force: true}); + cy.findByRole('button', {name: 'Edit in full page'}).click(); + cy.get('[data-fieldname="description"] .ql-editor').eq(0).type('Test ToDo', {force: true}); cy.wait(200); - cy.get('#page-ToDo > .page-head > .container > .row > .col > .standard-actions > .primary-action').contains('Save').click(); + cy.findByRole('button', {name: 'Save'}).click(); cy.wait(700); cy.visit('/app/todo'); - cy.get('.list-row > .level-left > .list-subject > .level-item.ellipsis > .ellipsis').eq(0).click(); + cy.get('.level-item.ellipsis').eq(0).click(); //To check if the comment box is initially empty and tying some text into it - cy.get('.comment-input-container > .frappe-control > .ql-container > .ql-editor').should('contain', '').type('Testing Timeline'); + cy.get('[data-fieldname="comment"] .ql-editor').should('contain', '').type('Testing Timeline'); //Adding new comment - cy.get('.comment-input-wrapper > .btn').contains('Comment').click(); + cy.findByRole('button', {name: 'Comment'}).click(); //To check if the commented text is visible in the timeline content cy.get('.timeline-content').should('contain', 'Testing Timeline'); //Editing comment cy.click_timeline_action_btn(0); - cy.get('.timeline-content > .timeline-message-box > .comment-edit-box > .frappe-control > .ql-container > .ql-editor').first().type(' 123'); + cy.get('.timeline-content [data-fieldname="comment"] .ql-editor').first().type(' 123'); cy.click_timeline_action_btn(0); //To check if the edited comment text is visible in timeline content @@ -37,20 +37,20 @@ context('Timeline', () => { //Discarding comment cy.click_timeline_action_btn(0); - cy.get('.actions > .btn').eq(1).first().click(); + cy.findByRole('button', {name: 'Dismiss'}).click(); //To check if after discarding the timeline content is same as previous cy.get('.timeline-content').should('contain', 'Testing Timeline 123'); //Deleting the added comment cy.get('.actions > .btn > .icon').first().click(); - cy.get('.modal-footer > .standard-actions > .btn-primary').contains('Yes').click(); + cy.findByRole('button', {name: 'Yes'}).click(); cy.click_modal_primary_button('Yes'); //Deleting the added ToDo - cy.get('#page-ToDo > .page-head > .container > .row > .col > .standard-actions > .menu-btn-group > .btn').click({force: true}); - cy.get('.menu-btn-group > .dropdown-menu > li > .grey-link').eq(17).click({force: true}); - cy.get('.modal.show > .modal-dialog > .modal-content > .modal-footer > .standard-actions > .btn-primary').contains('Yes').click({force: true}); + cy.get('.menu-btn-group button').eq(1).click(); + cy.get('.menu-btn-group [data-label="Delete"]').click(); + cy.findByRole('button', {name: 'Yes'}).click(); }); it('Timeline should have submit and cancel activity information', () => { @@ -64,31 +64,31 @@ context('Timeline', () => { //Adding a new entry for the created custom doctype cy.fill_field('title', 'Test'); - cy.get('.modal-footer > .standard-actions > .btn-primary').contains('Save').click(); - cy.get('.modal-footer > .standard-actions > .btn-primary').contains('Submit').click(); + cy.findByRole('button', {name: 'Save'}).click(); + cy.findByRole('button', {name: 'Submit'}).click(); cy.visit('/app/custom-submittable-doctype'); cy.get('.list-subject > .bold > .ellipsis').eq(0).click(); //To check if the submission of the documemt is visible in the timeline content cy.get('.timeline-content').should('contain', 'Administrator submitted this document'); - cy.get('.page-actions > .standard-actions > .btn-secondary').contains('Cancel').click({delay: 900}); - cy.get('.modal-footer > .standard-actions > .btn-primary').contains('Yes').click(); - + cy.findByRole('button', {name: 'Cancel'}).click({delay: 900}); + cy.findByRole('button', {name: 'Yes'}).click(); + //To check if the cancellation of the documemt is visible in the timeline content cy.get('.timeline-content').should('contain', 'Administrator cancelled this document'); //Deleting the document cy.visit('/app/custom-submittable-doctype'); cy.get('.list-subject > .select-like > .list-row-checkbox').eq(0).click(); - cy.get('.page-actions > .standard-actions > .actions-btn-group > .btn').contains('Actions').click(); + cy.findByRole('button', {name: 'Actions'}).click(); cy.get('.actions-btn-group > .dropdown-menu > li > .grey-link').eq(7).click(); cy.click_modal_primary_button('Yes', {force: true, delay: 700}); //Deleting the custom doctype cy.visit('/app/doctype'); cy.get('.list-subject > .select-like > .list-row-checkbox').eq(0).click(); - cy.get('.page-actions > .standard-actions > .actions-btn-group > .btn').contains('Actions').click(); - cy.get('.actions-btn-group > .dropdown-menu > li > .grey-link').eq(5).click(); + cy.findByRole('button', {name: 'Actions'}).click(); + cy.get('.actions-btn-group [data-label="Delete"]').click(); cy.click_modal_primary_button('Yes'); }); }); \ No newline at end of file From 29dfffb9c5d1877170ef19e14740f335e079df0a Mon Sep 17 00:00:00 2001 From: MitulDavid Date: Wed, 18 Aug 2021 19:32:16 +0530 Subject: [PATCH 158/306] refactor: Replace .format() with f-strings --- frappe/commands/utils.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frappe/commands/utils.py b/frappe/commands/utils.py index ac574841fe..be8304e45d 100644 --- a/frappe/commands/utils.py +++ b/frappe/commands/utils.py @@ -589,14 +589,14 @@ def run_ui_tests(context, app, headless=False, parallel=True, ci_build_id=None): admin_password = frappe.get_conf(site).admin_password # override baseUrl using env variable - site_env = 'CYPRESS_baseUrl={}'.format(site_url) - password_env = 'CYPRESS_adminPassword={}'.format(admin_password) if admin_password else '' + site_env = f'CYPRESS_baseUrl={site_url}' + password_env = f'CYPRESS_adminPassword={admin_password}' if admin_password else '' os.chdir(app_base_path) node_bin = subprocess.getoutput("npm bin") - cypress_path = "{0}/cypress".format(node_bin) - plugin_path = "{0}/../cypress-file-upload".format(node_bin) + cypress_path = f"{node_bin}/cypress" + plugin_path = f"{node_bin}/../cypress-file-upload" testing_library_path = f"{node_bin}/../@testing-library" # check if cypress in path...if not, install it. @@ -619,7 +619,7 @@ def run_ui_tests(context, app, headless=False, parallel=True, ci_build_id=None): formatted_command += ' --parallel' if ci_build_id: - formatted_command += ' --ci-build-id {}'.format(ci_build_id) + formatted_command += f' --ci-build-id {ci_build_id}' click.secho("Running Cypress...", fg="yellow") frappe.commands.popen(formatted_command, cwd=app_base_path, raise_err=True) From 5640366757860da10cf7b3af94307c89bfb0c5ab Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Wed, 18 Aug 2021 19:59:56 +0530 Subject: [PATCH 159/306] fix: Handle null values rows for XLSX format --- frappe/email/doctype/auto_email_report/auto_email_report.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/frappe/email/doctype/auto_email_report/auto_email_report.py b/frappe/email/doctype/auto_email_report/auto_email_report.py index f30279e308..90b869997e 100644 --- a/frappe/email/doctype/auto_email_report/auto_email_report.py +++ b/frappe/email/doctype/auto_email_report/auto_email_report.py @@ -133,8 +133,10 @@ class AutoEmailReport(Document): new_row = [] out.append(new_row) for df in columns: - if df.fieldname not in row: continue - new_row.append(frappe.format(row[df.fieldname], df, row)) + if row.get(df.fieldname): + new_row.append(frappe.format(row[df.fieldname], df, row)) + else: + new_row.append('') return out From eb37566ac0fb6434c752f7dabc93cf2113a8195e Mon Sep 17 00:00:00 2001 From: hasnain2808 Date: Wed, 18 Aug 2021 20:34:58 +0530 Subject: [PATCH 160/306] feat: min lines for ace editor --- frappe/public/js/frappe/form/controls/code.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/form/controls/code.js b/frappe/public/js/frappe/form/controls/code.js index 210bf57839..421af1cbb3 100644 --- a/frappe/public/js/frappe/form/controls/code.js +++ b/frappe/public/js/frappe/form/controls/code.js @@ -18,8 +18,12 @@ frappe.ui.form.ControlCode = class ControlCode extends frappe.ui.form.ControlTex const ace = window.ace; this.editor = ace.edit(this.ace_editor_target.get(0)); - if (this.df.max_lines) - this.editor.setOption("maxLines", this.df.max_lines); + if (this.df.max_lines || this.df.min_lines) { + if (this.df.max_lines) + this.editor.setOption("maxLines", this.df.max_lines); + if (this.df.min_lines) + this.editor.setOption("minLines", this.df.min_lines); + } else { this.expanded = false; this.$expand_button = $(``).click(() => { From 12c106719d6b24fc058eb4a83983edb14563542e Mon Sep 17 00:00:00 2001 From: Mohammad Hasnain Mohsin Rajan Date: Wed, 18 Aug 2021 20:44:36 +0530 Subject: [PATCH 161/306] style: close curly brace on the same line --- frappe/public/js/frappe/form/controls/code.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/form/controls/code.js b/frappe/public/js/frappe/form/controls/code.js index 421af1cbb3..27888fd49b 100644 --- a/frappe/public/js/frappe/form/controls/code.js +++ b/frappe/public/js/frappe/form/controls/code.js @@ -23,8 +23,7 @@ frappe.ui.form.ControlCode = class ControlCode extends frappe.ui.form.ControlTex this.editor.setOption("maxLines", this.df.max_lines); if (this.df.min_lines) this.editor.setOption("minLines", this.df.min_lines); - } - else { + } else { this.expanded = false; this.$expand_button = $(``).click(() => { this.expanded = !this.expanded; From 2fcd3b556da4427cf3286e438a650cf6d87c6cab Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Wed, 18 Aug 2021 22:53:35 +0530 Subject: [PATCH 162/306] fix: Use query report build_xlsx_data function for XLSX and CSV format --- frappe/desk/query_report.py | 4 +-- .../auto_email_report/auto_email_report.py | 31 ++++++++----------- 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py index b42c9c89a0..610eaf466a 100644 --- a/frappe/desk/query_report.py +++ b/frappe/desk/query_report.py @@ -391,7 +391,7 @@ def handle_duration_fieldtype_values(result, columns): return result -def build_xlsx_data(columns, data, visible_idx, include_indentation): +def build_xlsx_data(columns, data, visible_idx, include_indentation, ignore_visible_idx=False): result = [[]] column_widths = [] @@ -407,7 +407,7 @@ def build_xlsx_data(columns, data, visible_idx, include_indentation): # build table from result for row_idx, row in enumerate(data.result): # only pick up rows that are visible in the report - if row_idx in visible_idx: + if ignore_visible_idx or row_idx in visible_idx: row_data = [] if isinstance(row, dict): for col_idx, column in enumerate(data.columns): diff --git a/frappe/email/doctype/auto_email_report/auto_email_report.py b/frappe/email/doctype/auto_email_report/auto_email_report.py index 90b869997e..ccfff594b7 100644 --- a/frappe/email/doctype/auto_email_report/auto_email_report.py +++ b/frappe/email/doctype/auto_email_report/auto_email_report.py @@ -13,6 +13,7 @@ from frappe.utils import (format_time, get_link_to_form, get_url_to_report, from frappe.model.naming import append_number_if_name_exists from frappe.utils.csvutils import to_csv from frappe.utils.xlsxutils import make_xlsx +from frappe.desk.query_report import build_xlsx_data max_reports_per_user = frappe.local.conf.max_reports_per_user or 3 @@ -99,13 +100,21 @@ class AutoEmailReport(Document): return self.get_html_table(columns, data) elif self.format == 'XLSX': - spreadsheet_data = self.get_spreadsheet_data(columns, data) - xlsx_file = make_xlsx(spreadsheet_data, "Auto Email Report") + report_data = frappe._dict() + report_data['columns'] = columns + report_data['result'] = data + + xlsx_data, column_widths = build_xlsx_data(columns, report_data, [], 1, ignore_visible_idx=True) + xlsx_file = make_xlsx(xlsx_data, "Auto Email Report", column_widths=column_widths) return xlsx_file.getvalue() elif self.format == 'CSV': - spreadsheet_data = self.get_spreadsheet_data(columns, data) - return to_csv(spreadsheet_data) + report_data = frappe._dict() + report_data['columns'] = columns + report_data['result'] = data + + xlsx_data, column_widths = build_xlsx_data(columns, report_data, [], 1, ignore_visible_idx=True) + return to_csv(xlsx_data) else: frappe.throw(_('Invalid Output Format')) @@ -126,20 +135,6 @@ class AutoEmailReport(Document): 'edit_report_settings': get_link_to_form('Auto Email Report', self.name) }) - @staticmethod - def get_spreadsheet_data(columns, data): - out = [[_(df.label) for df in columns], ] - for row in data: - new_row = [] - out.append(new_row) - for df in columns: - if row.get(df.fieldname): - new_row.append(frappe.format(row[df.fieldname], df, row)) - else: - new_row.append('') - - return out - def get_file_name(self): return "{0}.{1}".format(self.report.replace(" ", "-").replace("/", "-"), self.format.lower()) From 68263b8663ba2e79622441209757db844c876be4 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 19 Aug 2021 12:27:44 +0530 Subject: [PATCH 163/306] fix: App without home page gives error when navigate to home --- frappe/public/js/frappe/router.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/router.js b/frappe/public/js/frappe/router.js index 4360f3e887..c27e443c06 100644 --- a/frappe/public/js/frappe/router.js +++ b/frappe/public/js/frappe/router.js @@ -354,8 +354,8 @@ frappe.router = { return a; } }).join('/'); - - return '/app/' + (path_string || 'home'); + let default_page = frappe.workspaces['home'] ? 'home' : Object.keys(frappe.workspaces)[0]; + return '/app/' + (path_string || default_page); }, push_state(url) { From b96b4c90f76b5500ec6899265e2ea216e1c8f0eb Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 19 Aug 2021 12:30:59 +0530 Subject: [PATCH 164/306] fix: Can't navigate to webpage with name same as private workspace --- frappe/public/js/frappe/router.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/router.js b/frappe/public/js/frappe/router.js index c27e443c06..484f1ac911 100644 --- a/frappe/public/js/frappe/router.js +++ b/frappe/public/js/frappe/router.js @@ -129,7 +129,7 @@ frappe.router = { if (frappe.workspaces[route[0]]) { // public workspace route = ['Workspaces', frappe.workspaces[route[0]].title]; - } else if (frappe.workspaces[route[1]]) { + } else if (route[0] == 'private' && frappe.workspaces[route[1]]) { // private workspace route = ['Workspaces', 'private', frappe.workspaces[route[1]].title]; } else if (this.routes[route[0]]) { From 461dfd6c6e14a08fdd5f5e0e7bb06a1e8769192b Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 19 Aug 2021 12:42:43 +0530 Subject: [PATCH 165/306] fix: Make Content hidden and added validation --- frappe/desk/doctype/workspace/workspace.json | 15 ++++++++------- frappe/desk/doctype/workspace/workspace.py | 3 +++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/frappe/desk/doctype/workspace/workspace.json b/frappe/desk/doctype/workspace/workspace.json index e2ae38faf1..e991ee3f8f 100644 --- a/frappe/desk/doctype/workspace/workspace.json +++ b/frappe/desk/doctype/workspace/workspace.json @@ -28,7 +28,6 @@ "pin_to_bottom", "hide_custom", "public", - "content_section", "content", "section_break_2", "charts_label", @@ -39,6 +38,7 @@ "section_break_18", "cards_label", "links", + "roles_section", "roles" ], "fields": [ @@ -239,14 +239,10 @@ "fieldtype": "Data", "label": "Parent Page" }, - { - "fieldname": "content_section", - "fieldtype": "Section Break", - "label": "Content" - }, { "fieldname": "content", "fieldtype": "Long Text", + "hidden": 1, "label": "Content" }, { @@ -259,10 +255,15 @@ "fieldtype": "Table", "label": "Roles", "options": "Has Role" + }, + { + "fieldname": "roles_section", + "fieldtype": "Section Break", + "label": "Roles" } ], "links": [], - "modified": "2021-08-05 11:49:09.028243", + "modified": "2021-08-19 12:36:29.825169", "modified_by": "Administrator", "module": "Desk", "name": "Workspace", diff --git a/frappe/desk/doctype/workspace/workspace.py b/frappe/desk/doctype/workspace/workspace.py index 0821ae03c4..693c34bcd1 100644 --- a/frappe/desk/doctype/workspace/workspace.py +++ b/frappe/desk/doctype/workspace/workspace.py @@ -17,6 +17,9 @@ class Workspace(Document): frappe.throw(_("You need to be in developer mode to edit this document")) validate_route_conflict(self.doctype, self.name) + if isinstance(self.content, list): + frappe.throw(_("Content data shoud be a list")) + duplicate_exists = frappe.db.exists("Workspace", { "name": ["!=", self.name], 'is_default': 1, 'extends': self.extends }) From 1032d3a7d1101b9e7d68032e7c9d7c244ca21cc3 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 19 Aug 2021 12:49:45 +0530 Subject: [PATCH 166/306] fix: Removed default collapsing sidebar section --- frappe/public/js/frappe/views/workspace/workspace.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index b46c220d9d..8f11e711ca 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -174,10 +174,6 @@ frappe.views.Workspace = class Workspace { $(e.target).parent().find('.sidebar-item-container').toggleClass('hidden'); }); - if (!this.current_page.name) { - $title.trigger("click"); - } - if (Object.keys(root_pages).length === 0) { sidebar_section.addClass('hidden'); } From bb55ca4c29c584275ed6a14660552250da4744b9 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 19 Aug 2021 12:51:40 +0530 Subject: [PATCH 167/306] fix: Make title and label field mandatory --- frappe/desk/doctype/workspace/workspace.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/frappe/desk/doctype/workspace/workspace.json b/frappe/desk/doctype/workspace/workspace.json index e991ee3f8f..020f3153df 100644 --- a/frappe/desk/doctype/workspace/workspace.json +++ b/frappe/desk/doctype/workspace/workspace.json @@ -46,6 +46,7 @@ "fieldname": "label", "fieldtype": "Data", "label": "Name", + "reqd": 1, "unique": 1 }, { @@ -232,7 +233,8 @@ { "fieldname": "title", "fieldtype": "Data", - "label": "Title" + "label": "Title", + "reqd": 1 }, { "fieldname": "parent_page", @@ -263,7 +265,7 @@ } ], "links": [], - "modified": "2021-08-19 12:36:29.825169", + "modified": "2021-08-19 12:51:00.233017", "modified_by": "Administrator", "module": "Desk", "name": "Workspace", From 6a599f77ebf29a6e466ad44c75c915586ff8971a Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 19 Aug 2021 14:07:52 +0530 Subject: [PATCH 168/306] fix: Content validation --- frappe/desk/doctype/workspace/workspace.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frappe/desk/doctype/workspace/workspace.py b/frappe/desk/doctype/workspace/workspace.py index 693c34bcd1..31ae5754c1 100644 --- a/frappe/desk/doctype/workspace/workspace.py +++ b/frappe/desk/doctype/workspace/workspace.py @@ -17,7 +17,10 @@ class Workspace(Document): frappe.throw(_("You need to be in developer mode to edit this document")) validate_route_conflict(self.doctype, self.name) - if isinstance(self.content, list): + try: + if not isinstance(loads(self.content), list): + raise + except: frappe.throw(_("Content data shoud be a list")) duplicate_exists = frappe.db.exists("Workspace", { From ca4d220f145d0678f2621e3631a8993c2c3d02b3 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 19 Aug 2021 14:20:18 +0530 Subject: [PATCH 169/306] fix: sider fix --- frappe/desk/doctype/workspace/workspace.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/desk/doctype/workspace/workspace.py b/frappe/desk/doctype/workspace/workspace.py index 31ae5754c1..7795d02616 100644 --- a/frappe/desk/doctype/workspace/workspace.py +++ b/frappe/desk/doctype/workspace/workspace.py @@ -20,7 +20,7 @@ class Workspace(Document): try: if not isinstance(loads(self.content), list): raise - except: + except Exception: frappe.throw(_("Content data shoud be a list")) duplicate_exists = frappe.db.exists("Workspace", { From c681b1af27fb3c975496e8b8679c4fff997586fd Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 19 Aug 2021 14:40:20 +0530 Subject: [PATCH 170/306] fix: Make thumbnail function --- frappe/core/doctype/file/file.py | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index e79b2bd761..f09f5bcaa2 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -21,7 +21,7 @@ import zipfile import requests import requests.exceptions from PIL import Image, ImageFile, ImageOps -from io import StringIO +from io import BytesIO from urllib.parse import quote, unquote import frappe @@ -270,16 +270,12 @@ class File(Document): def make_thumbnail(self, set_as_thumbnail=True, width=300, height=300, suffix="small", crop=False): if self.file_url: - if self.file_url.startswith("/files"): - try: + try: + if self.file_url.startswith(("/files", "/private/files")): image, filename, extn = get_local_image(self.file_url) - except IOError: - return - - else: - try: + else: image, filename, extn = get_web_image(self.file_url) - except (requests.exceptions.HTTPError, requests.exceptions.SSLError, IOError, TypeError): + except (requests.exceptions.HTTPError, requests.exceptions.SSLError, IOError, TypeError): return size = width, height @@ -289,16 +285,13 @@ class File(Document): image.thumbnail(size, Image.ANTIALIAS) thumbnail_url = filename + "_" + suffix + "." + extn - path = os.path.abspath(frappe.get_site_path("public", thumbnail_url.lstrip("/"))) try: image.save(path) - if set_as_thumbnail: self.db_set("thumbnail_url", thumbnail_url) - self.db_set("thumbnail_url", thumbnail_url) except IOError: frappe.msgprint(_("Unable to write file format for {0}").format(path)) return @@ -704,7 +697,7 @@ def get_web_image(file_url): raise try: - image = Image.open(StringIO(frappe.safe_decode(r.content))) + image = Image.open(BytesIO(r.content)) except Exception as e: frappe.msgprint(_("Image link '{0}' is not valid").format(file_url), raise_exception=e) @@ -886,7 +879,7 @@ def extract_images_from_html(doc, content): if b"," in content: content = content.split(b",")[1] content = base64.b64decode(content) - + content = optimize_image(content, mtype) if "filename=" in headers: From 1427712c8817a01fa3631535eb15267fc5120465 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 19 Aug 2021 14:41:25 +0530 Subject: [PATCH 171/306] test: Add test cases for file - file_url validations - make_thumbnail --- frappe/core/doctype/file/test_file.py | 52 +++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/frappe/core/doctype/file/test_file.py b/frappe/core/doctype/file/test_file.py index 649010c468..5b63da30ef 100644 --- a/frappe/core/doctype/file/test_file.py +++ b/frappe/core/doctype/file/test_file.py @@ -365,6 +365,58 @@ class TestFile(unittest.TestCase): file1.file_url = '/private/files/parent_dir2.txt' file1.save() + def test_file_url_validation(self): + test_file = frappe.get_doc({ + "doctype": "File", + "file_name": 'logo', + "file_url": 'https://frappe.io/files/frappe.png' + }) + + self.assertIsNone(test_file.validate()) + + # bad path + test_file.file_url = "/usr/bin/man" + self.assertRaisesRegex(frappe.exceptions.ValidationError, "URL must start with http:// or https://", test_file.validate) + + test_file.file_url = None + test_file.file_name = "/usr/bin/man" + self.assertRaisesRegex(frappe.exceptions.ValidationError, "There is some problem with the file url", test_file.validate) + + test_file.file_url = None + test_file.file_name = "_file" + self.assertRaisesRegex(IOError, "does not exist", test_file.validate) + + test_file.file_url = None + test_file.file_name = "/private/files/_file" + self.assertRaisesRegex(IOError, "does not exist", test_file.validate) + + def test_make_thumbnail(self): + # test web image + test_file = frappe.get_doc({ + "doctype": "File", + "file_name": 'logo', + "file_url": frappe.utils.get_url('/_test/assets/image.jpg'), + "docstatus": 0 + }).insert() + + test_file.make_thumbnail() + self.assertEquals(test_file.thumbnail_url, '/files/image_small.jpg') + + # test local image + test_file.db_set('thumbnail_url', None) + test_file.reload() + test_file.file_url = "/files/image_small.jpg" + test_file.make_thumbnail(suffix="xs") + self.assertEquals(test_file.thumbnail_url, '/files/image_small_xs.jpg') + + frappe.clear_messages() + test_file.db_set('thumbnail_url', None) + test_file.reload() + test_file.file_url = frappe.utils.get_url('unknown.jpg') + test_file.make_thumbnail(suffix="xs") + self.assertEqual(frappe.message_log[0], '{"message": "File \'http://test-site:8000/unknown.jpg\' not found"}') + self.assertEquals(test_file.thumbnail_url, None) + class TestAttachment(unittest.TestCase): test_doctype = 'Test For Attachment' From a7fb1816aa873e4afc8963f6dddc4b79640bfc9d Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 19 Aug 2021 15:27:25 +0530 Subject: [PATCH 172/306] refactor: Remove unused and redundant code --- frappe/core/doctype/file/file.py | 75 ----------------- .../prepared_report/prepared_report.py | 3 +- frappe/desk/form/utils.py | 2 +- frappe/model/delete_doc.py | 2 +- frappe/utils/file_manager.py | 80 +++---------------- .../personal_data_download_request.py | 2 +- 6 files changed, 14 insertions(+), 150 deletions(-) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index f09f5bcaa2..b44a06876e 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -352,10 +352,6 @@ class File(Document): return files - def get_file_url(self): - data = frappe.db.get_value("File", self.file_data_name, ["file_name", "file_url"], as_dict=True) - return data.file_url or data.file_name - def exists_on_disk(self): exists = os.path.exists(self.get_full_path()) return exists @@ -424,33 +420,6 @@ class File(Document): return get_files_path(self.file_name, is_private=self.is_private) - def get_file_doc(self): - '''returns File object (Document) from given parameters or form_dict''' - r = frappe.form_dict - - if self.file_url is None: self.file_url = r.file_url - if self.file_name is None: self.file_name = r.file_name - if self.attached_to_doctype is None: self.attached_to_doctype = r.doctype - if self.attached_to_name is None: self.attached_to_name = r.docname - if self.attached_to_field is None: self.attached_to_field = r.docfield - if self.folder is None: self.folder = r.folder - if self.is_private is None: self.is_private = r.is_private - - if r.filedata: - file_doc = self.save_uploaded() - - elif r.file_url: - file_doc = self.save() - - return file_doc - - - def save_uploaded(self): - self.content = self.get_uploaded_content() - if self.content: - return self.save() - else: - raise Exception def get_uploaded_content(self): # should not be unicode when reading a file, hence using frappe.form @@ -532,14 +501,6 @@ class File(Document): 'file_url': self.file_url } - def get_file_data_from_hash(self): - for name in frappe.db.sql_list("select name from `tabFile` where content_hash=%s and is_private=%s", - (self.content_hash, self.is_private)): - b = frappe.get_doc('File', name) - return {k: b.get(k) for k in frappe.get_hooks()['write_file_keys']} - return False - - def check_max_file_size(self): max_file_size = get_max_file_size() file_size = len(self.content) @@ -733,48 +694,12 @@ def delete_file(path): os.remove(path) -def remove_file(fid=None, attached_to_doctype=None, attached_to_name=None, from_delete=False, delete_permanently=False): - """Remove file and File entry""" - file_name = None - if not (attached_to_doctype and attached_to_name): - attached = frappe.db.get_value("File", fid, - ["attached_to_doctype", "attached_to_name", "file_name"]) - if attached: - attached_to_doctype, attached_to_name, file_name = attached - - ignore_permissions, comment = False, None - if attached_to_doctype and attached_to_name and not from_delete: - doc = frappe.get_doc(attached_to_doctype, attached_to_name) - ignore_permissions = doc.has_permission("write") or False - if frappe.flags.in_web_form: - ignore_permissions = True - if not file_name: - file_name = frappe.db.get_value("File", fid, "file_name") - comment = doc.add_comment("Attachment Removed", _("Removed {0}").format(file_name)) - frappe.delete_doc("File", fid, ignore_permissions=ignore_permissions, delete_permanently=delete_permanently) - - return comment def get_max_file_size(): return cint(conf.get('max_file_size')) or 10485760 -def remove_all(dt, dn, from_delete=False, delete_permanently=False): - """remove all files in a transaction""" - try: - for fid in frappe.db.sql_list("""select name from `tabFile` where - attached_to_doctype=%s and attached_to_name=%s""", (dt, dn)): - if from_delete: - # If deleting a doc, directly delete files - frappe.delete_doc("File", fid, ignore_permissions=True, delete_permanently=delete_permanently) - else: - # Removes file and adds a comment in the document it is attached to - remove_file(fid=fid, attached_to_doctype=dt, attached_to_name=dn, - from_delete=from_delete, delete_permanently=delete_permanently) - except Exception as e: - if e.args[0]!=1054: raise # (temp till for patched) - def has_permission(doc, ptype=None, user=None): has_access = False diff --git a/frappe/core/doctype/prepared_report/prepared_report.py b/frappe/core/doctype/prepared_report/prepared_report.py index c68bb6a4f1..409aa6f217 100644 --- a/frappe/core/doctype/prepared_report/prepared_report.py +++ b/frappe/core/doctype/prepared_report/prepared_report.py @@ -11,8 +11,7 @@ from frappe.desk.query_report import generate_report_result from frappe.model.document import Document from frappe.utils import gzip_compress, gzip_decompress from frappe.utils.background_jobs import enqueue -from frappe.core.doctype.file.file import remove_all - +from frappe.utils.file_manager import remove_all class PreparedReport(Document): def before_insert(self): diff --git a/frappe/desk/form/utils.py b/frappe/desk/form/utils.py index bfceee6ea2..d7ac940d21 100644 --- a/frappe/desk/form/utils.py +++ b/frappe/desk/form/utils.py @@ -5,7 +5,7 @@ import frappe, json import frappe.desk.form.meta import frappe.desk.form.load from frappe.desk.form.document_follow import follow_document -from frappe.utils.file_manager import extract_images_from_html +from frappe.core.doctype.file.file import extract_images_from_html from frappe import _ diff --git a/frappe/model/delete_doc.py b/frappe/model/delete_doc.py index fbbf1a4852..c2f750b744 100644 --- a/frappe/model/delete_doc.py +++ b/frappe/model/delete_doc.py @@ -10,7 +10,7 @@ import frappe.model.meta from frappe import _ from frappe import get_module_path from frappe.model.dynamic_links import get_dynamic_link_map -from frappe.core.doctype.file.file import remove_all +from frappe.utils.file_manager import remove_all from frappe.utils.password import delete_all_passwords_for from frappe.model.naming import revert_series_if_last from frappe.utils.global_search import delete_for_document diff --git a/frappe/utils/file_manager.py b/frappe/utils/file_manager.py index 7efdff299b..eb4556c47c 100644 --- a/frappe/utils/file_manager.py +++ b/frappe/utils/file_manager.py @@ -213,28 +213,22 @@ def write_file(content, fname, is_private=0): return get_files_path(fname, is_private=is_private) -def remove_all(dt, dn, from_delete=False): +def remove_all(dt, dn, from_delete=False, delete_permanently=False): """remove all files in a transaction""" try: for fid in frappe.db.sql_list("""select name from `tabFile` where attached_to_doctype=%s and attached_to_name=%s""", (dt, dn)): - remove_file(fid, dt, dn, from_delete) + if from_delete: + # If deleting a doc, directly delete files + frappe.delete_doc("File", fid, ignore_permissions=True, delete_permanently=delete_permanently) + else: + # Removes file and adds a comment in the document it is attached to + remove_file(fid=fid, attached_to_doctype=dt, attached_to_name=dn, + from_delete=from_delete, delete_permanently=delete_permanently) except Exception as e: if e.args[0]!=1054: raise # (temp till for patched) - -def remove_file_by_url(file_url, doctype=None, name=None): - if doctype and name: - fid = frappe.db.get_value("File", {"file_url": file_url, - "attached_to_doctype": doctype, "attached_to_name": name}) - else: - fid = frappe.db.get_value("File", {"file_url": file_url}) - - if fid: - return remove_file(fid) - - -def remove_file(fid, attached_to_doctype=None, attached_to_name=None, from_delete=False): +def remove_file(fid=None, attached_to_doctype=None, attached_to_name=None, from_delete=False, delete_permanently=False): """Remove file and File entry""" file_name = None if not (attached_to_doctype and attached_to_name): @@ -252,8 +246,7 @@ def remove_file(fid, attached_to_doctype=None, attached_to_name=None, from_delet if not file_name: file_name = frappe.db.get_value("File", fid, "file_name") comment = doc.add_comment("Attachment Removed", _("Removed {0}").format(file_name)) - - frappe.delete_doc("File", fid, ignore_permissions=ignore_permissions) + frappe.delete_doc("File", fid, ignore_permissions=ignore_permissions, delete_permanently=delete_permanently) return comment @@ -372,59 +365,6 @@ def download_file(file_url): frappe.local.response.filecontent = filedata frappe.local.response.type = "download" -def extract_images_from_doc(doc, fieldname): - content = doc.get(fieldname) - content = extract_images_from_html(doc, content) - if frappe.flags.has_dataurl: - doc.set(fieldname, content) - - -def extract_images_from_html(doc, content): - frappe.flags.has_dataurl = False - - def _save_file(match): - data = match.group(1) - data = data.split("data:")[1] - headers, content = data.split(",") - mtype = headers.split(";")[0] - - if isinstance(content, str): - content = content.encode("utf-8") - if b"," in content: - content = content.split(b",")[1] - content = base64.b64decode(content) - - content = optimize_image(content, mtype) - - if "filename=" in headers: - filename = headers.split("filename=")[-1] - - # decode filename - if not isinstance(filename, str): - filename = str(filename, 'utf-8') - else: - filename = get_random_filename(content_type=mtype) - - doctype = doc.parenttype if doc.parent else doc.doctype - name = doc.parent or doc.name - - if doc.doctype == "Comment": - doctype = doc.reference_doctype - name = doc.reference_name - - # TODO fix this - file_url = save_file(filename, content, doctype, name, decode=False).get("file_url") - if not frappe.flags.has_dataurl: - frappe.flags.has_dataurl = True - - return ']*src\s*=\s*["\'](?=data:)(.*?)["\']', _save_file, content) - - return content - - def get_random_filename(extn=None, content_type=None): if extn: if not extn.startswith("."): diff --git a/frappe/website/doctype/personal_data_download_request/personal_data_download_request.py b/frappe/website/doctype/personal_data_download_request/personal_data_download_request.py index 9255adb8c2..e74e8190c4 100644 --- a/frappe/website/doctype/personal_data_download_request/personal_data_download_request.py +++ b/frappe/website/doctype/personal_data_download_request/personal_data_download_request.py @@ -28,7 +28,7 @@ class PersonalDataDownloadRequest(Document): }) f.save(ignore_permissions=True) - file_link = frappe.utils.get_url("/api/method/frappe.core.doctype.file.file.download_file") +\ + file_link = frappe.utils.get_url("/api/method/frappe.utils.file_manager.download_file") +\ "?" + get_signed_params({"file_url": f.file_url}) host_name = frappe.local.site frappe.sendmail( From 6b1955b34afafa930c0c8882ef76f05a23a1e2eb Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 19 Aug 2021 15:27:48 +0530 Subject: [PATCH 173/306] test: Add test image file --- frappe/core/doctype/file/test_file.py | 2 +- frappe/www/_test/assets/image.jpg | Bin 0 -> 161713 bytes 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 frappe/www/_test/assets/image.jpg diff --git a/frappe/core/doctype/file/test_file.py b/frappe/core/doctype/file/test_file.py index 5b63da30ef..1920148fca 100644 --- a/frappe/core/doctype/file/test_file.py +++ b/frappe/core/doctype/file/test_file.py @@ -397,7 +397,7 @@ class TestFile(unittest.TestCase): "file_name": 'logo', "file_url": frappe.utils.get_url('/_test/assets/image.jpg'), "docstatus": 0 - }).insert() + }).insert(ignore_permissions=True) test_file.make_thumbnail() self.assertEquals(test_file.thumbnail_url, '/files/image_small.jpg') diff --git a/frappe/www/_test/assets/image.jpg b/frappe/www/_test/assets/image.jpg new file mode 100644 index 0000000000000000000000000000000000000000..4a2c1552b991add9a356a460415626ad700f401b GIT binary patch literal 161713 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 literal 0 HcmV?d00001 From 21e664b23b07797765b79d42fc222985277e8ff7 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 19 Aug 2021 16:02:20 +0530 Subject: [PATCH 174/306] test: Fix file_name assertion --- frappe/core/doctype/file/test_file.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/core/doctype/file/test_file.py b/frappe/core/doctype/file/test_file.py index 1920148fca..ce971221c5 100644 --- a/frappe/core/doctype/file/test_file.py +++ b/frappe/core/doctype/file/test_file.py @@ -2,6 +2,7 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # See license.txt import base64 +import json import frappe import os import unittest @@ -414,7 +415,7 @@ class TestFile(unittest.TestCase): test_file.reload() test_file.file_url = frappe.utils.get_url('unknown.jpg') test_file.make_thumbnail(suffix="xs") - self.assertEqual(frappe.message_log[0], '{"message": "File \'http://test-site:8000/unknown.jpg\' not found"}') + self.assertEqual(json.loads(frappe.message_log[0]), {"message": f"File '{frappe.utils.get_url('unknown.jpg')}' not found"}) self.assertEquals(test_file.thumbnail_url, None) class TestAttachment(unittest.TestCase): From 44c82276e830f7b720703e1aeffdfd724013fc0c Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 19 Aug 2021 17:37:01 +0530 Subject: [PATCH 175/306] refactor: Remove unused methods --- frappe/utils/file_manager.py | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/frappe/utils/file_manager.py b/frappe/utils/file_manager.py index eb4556c47c..b1e088d641 100644 --- a/frappe/utils/file_manager.py +++ b/frappe/utils/file_manager.py @@ -365,23 +365,6 @@ def download_file(file_url): frappe.local.response.filecontent = filedata frappe.local.response.type = "download" -def get_random_filename(extn=None, content_type=None): - if extn: - if not extn.startswith("."): - extn = "." + extn - - elif content_type: - extn = mimetypes.guess_extension(content_type) - - return random_string(7) + (extn or "") - -@frappe.whitelist(allow_guest=True) -def validate_filename(filename): - from frappe.utils import now_datetime - timestamp = now_datetime().strftime(" %Y-%m-%d %H:%M:%S") - fname = get_file_name(filename, timestamp) - return fname - @frappe.whitelist() def add_attachments(doctype, name, attachments): '''Add attachments to the given DocType''' From bc234e9052d8de5f9c8a59fa51379d750f7c537c Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 19 Aug 2021 17:38:09 +0530 Subject: [PATCH 176/306] test: Add test case for extract_image_from_doc --- frappe/core/doctype/file/test_file.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/frappe/core/doctype/file/test_file.py b/frappe/core/doctype/file/test_file.py index ce971221c5..72fe3491d1 100644 --- a/frappe/core/doctype/file/test_file.py +++ b/frappe/core/doctype/file/test_file.py @@ -522,3 +522,22 @@ class TestAttachmentsAccess(unittest.TestCase): frappe.set_user('Administrator') frappe.db.rollback() + + +class TestFileUtils(unittest.TestCase): + def test_extract_images_from_doc(self): + # with filename in data URI + todo = frappe.get_doc({ + "doctype": "ToDo", + "description": 'Test ' + }).insert() + self.assertTrue(frappe.db.exists("File", {"attached_to_name": todo.name})) + self.assertIn('', todo.description) + + # withot filename in data URI + todo = frappe.get_doc({ + "doctype": "ToDo", + "description": 'Test ' + }).insert() + filename = frappe.db.exists("File", {"attached_to_name": todo.name}) + self.assertIn(f' Date: Thu, 19 Aug 2021 17:39:45 +0530 Subject: [PATCH 177/306] fix: File name from data URI headers --- frappe/core/doctype/file/file.py | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index b44a06876e..85e9a5f27b 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -25,7 +25,7 @@ from io import BytesIO from urllib.parse import quote, unquote import frappe -from frappe import _, conf +from frappe import _, conf, safe_decode from frappe.model.document import Document from frappe.utils import call_hook_method, cint, cstr, encode, get_files_path, get_hook_method, random_string, strip from frappe.utils.image import strip_exif_data, optimize_image @@ -809,10 +809,8 @@ def extract_images_from_html(doc, content): if "filename=" in headers: filename = headers.split("filename=")[-1] + filename = safe_decode(filename).split(";")[0] - # decode filename - if not isinstance(filename, str): - filename = str(filename, 'utf-8') else: filename = get_random_filename(content_type=mtype) @@ -840,12 +838,9 @@ def extract_images_from_html(doc, content): return content -def get_random_filename(extn=None, content_type=None): - if extn: - if not extn.startswith("."): - extn = "." + extn - - elif content_type: +def get_random_filename(content_type=None): + extn = None + if content_type: extn = mimetypes.guess_extension(content_type) return random_string(7) + (extn or "") @@ -897,13 +892,6 @@ def get_attached_images(doctype, names): return out -@frappe.whitelist() -def validate_filename(filename): - from frappe.utils import now_datetime - timestamp = now_datetime().strftime(" %Y-%m-%d %H:%M:%S") - fname = get_file_name(filename, timestamp) - return fname - @frappe.whitelist() def get_files_in_folder(folder, start=0, page_length=20): start = cint(start) From 1cf1bc1e068e38a9932cd4823a3a58c080dec621 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 19 Aug 2021 17:48:40 +0530 Subject: [PATCH 178/306] refactor: Remove unused functions --- frappe/core/doctype/file/file.py | 14 -------------- frappe/utils/csvutils.py | 11 +---------- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index 85e9a5f27b..8d0eee8c69 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -420,20 +420,6 @@ class File(Document): return get_files_path(self.file_name, is_private=self.is_private) - - def get_uploaded_content(self): - # should not be unicode when reading a file, hence using frappe.form - if 'filedata' in frappe.form_dict: - if "," in frappe.form_dict.filedata: - frappe.form_dict.filedata = frappe.form_dict.filedata.rsplit(",", 1)[1] - frappe.uploaded_content = base64.b64decode(frappe.form_dict.filedata) - return frappe.uploaded_content - elif self.content: - return self.content - frappe.msgprint(_('No file attached')) - return None - - def save_file(self, content=None, decode=False, ignore_existing_file_check=False): file_exists = False self.content = content diff --git a/frappe/utils/csvutils.py b/frappe/utils/csvutils.py index 734d68fe8a..69b7f6f2d3 100644 --- a/frappe/utils/csvutils.py +++ b/frappe/utils/csvutils.py @@ -6,16 +6,7 @@ import json import csv import requests from io import StringIO -from frappe.utils import encode, cstr, cint, flt, comma_or - -def read_csv_content_from_uploaded_file(ignore_encoding=False): - if getattr(frappe, "uploaded_file", None): - with open(frappe.uploaded_file, "r") as upfile: - fcontent = upfile.read() - else: - _file = frappe.new_doc("File") - fcontent = _file.get_uploaded_content() - return read_csv_content(fcontent, ignore_encoding) +from frappe.utils import cstr, cint, flt, comma_or def read_csv_content_from_attached_file(doc): fileid = frappe.get_all("File", fields = ["name"], filters = {"attached_to_doctype": doc.doctype, From 133be72dfdbb9a108bd10e49f8b33f0ed4c4b331 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 19 Aug 2021 18:21:40 +0530 Subject: [PATCH 179/306] fix: Do frappe.db.commit() only for GET request --- frappe/core/doctype/access_log/access_log.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/core/doctype/access_log/access_log.py b/frappe/core/doctype/access_log/access_log.py index 2ea014f981..82db450b4a 100644 --- a/frappe/core/doctype/access_log/access_log.py +++ b/frappe/core/doctype/access_log/access_log.py @@ -29,4 +29,5 @@ def make_access_log(doctype=None, document=None, method=None, file_type=None, doc.insert(ignore_permissions=True) # `frappe.db.commit` added because insert doesnt `commit` when called in GET requests like `printview` - frappe.db.commit() + if frappe.request and frappe.request.method == 'GET': + frappe.db.commit() From 6b789ec53ad789416638bd0ee34fcd739bf010e4 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 19 Aug 2021 18:44:36 +0530 Subject: [PATCH 180/306] fix: Revert auto_commit after frappe.sendmail --- frappe/email/doctype/newsletter/newsletter.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/email/doctype/newsletter/newsletter.py b/frappe/email/doctype/newsletter/newsletter.py index 667d0fb34c..a118240488 100755 --- a/frappe/email/doctype/newsletter/newsletter.py +++ b/frappe/email/doctype/newsletter/newsletter.py @@ -165,6 +165,7 @@ class Newsletter(WebsiteGenerator): sender = self.send_from or frappe.utils.get_formatted_email(self.owner) args = {"message": message, "name": self.name} + is_auto_commit_set = bool(frappe.db.auto_commit_on_many_writes) frappe.db.auto_commit_on_many_writes = not frappe.flags.in_test frappe.sendmail( @@ -184,7 +185,7 @@ class Newsletter(WebsiteGenerator): args=args, ) - frappe.db.auto_commit_on_many_writes = not frappe.flags.in_test + frappe.db.auto_commit_on_many_writes = is_auto_commit_set def get_message(self) -> str: if self.content_type == "HTML": From 07906594e3fb8cb24417932eb327132e282296d4 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 19 Aug 2021 19:33:37 +0530 Subject: [PATCH 181/306] test: Fix failing test --- frappe/core/doctype/file/test_file.py | 2 +- frappe/core/doctype/user/test_user.py | 2 +- frappe/desk/doctype/notification_log/test_notification_log.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/core/doctype/file/test_file.py b/frappe/core/doctype/file/test_file.py index 72fe3491d1..df0ba8c2ec 100644 --- a/frappe/core/doctype/file/test_file.py +++ b/frappe/core/doctype/file/test_file.py @@ -534,7 +534,7 @@ class TestFileUtils(unittest.TestCase): self.assertTrue(frappe.db.exists("File", {"attached_to_name": todo.name})) self.assertIn('', todo.description) - # withot filename in data URI + # without filename in data URI todo = frappe.get_doc({ "doctype": "ToDo", "description": 'Test ' diff --git a/frappe/core/doctype/user/test_user.py b/frappe/core/doctype/user/test_user.py index 6534e70235..5fea8ed9d8 100644 --- a/frappe/core/doctype/user/test_user.py +++ b/frappe/core/doctype/user/test_user.py @@ -346,7 +346,7 @@ class TestUser(unittest.TestCase): self.assertEqual(update_password(new_password, old_password=old_password), "/") # reset password update_password(old_password, old_password=new_password) - frappe.set_user("Administrator") + def test_password_verification(self): diff --git a/frappe/desk/doctype/notification_log/test_notification_log.py b/frappe/desk/doctype/notification_log/test_notification_log.py index af4dee8df3..2d232cf942 100644 --- a/frappe/desk/doctype/notification_log/test_notification_log.py +++ b/frappe/desk/doctype/notification_log/test_notification_log.py @@ -55,6 +55,6 @@ def get_todo(): def get_user(): users = frappe.db.get_all('User', - filters={'name': ('not in', ['Administrator', 'Guest'])}, + filters={'name': ('not in', ['Administrator', 'Guest']), 'enabled': 1}, fields='name', limit=1) return users[0].name From c00a5003f482dd37326495ceda2cb418f5317839 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 19 Aug 2021 19:46:50 +0530 Subject: [PATCH 182/306] refactor(tests): frappe.db.delete > frappe.db.sql Use frappe.db.delete wherever possible. Get rid of all the frappe.db.sql ;) This commit focuses on the frappe.tests module --- frappe/tests/test_assign.py | 2 +- frappe/tests/test_db_query.py | 2 +- frappe/tests/test_domainification.py | 6 +++--- frappe/tests/test_dynamic_links.py | 2 +- frappe/tests/test_email.py | 8 ++++---- frappe/tests/test_frappe_client.py | 24 ++++++++++++------------ frappe/tests/test_global_search.py | 10 +++++----- frappe/tests/test_goal.py | 2 +- frappe/tests/test_naming.py | 16 ++++++++-------- frappe/tests/test_permissions.py | 8 ++++---- frappe/tests/test_scheduler.py | 2 +- 11 files changed, 41 insertions(+), 41 deletions(-) diff --git a/frappe/tests/test_assign.py b/frappe/tests/test_assign.py index e9c1ccec6d..e553fc3f5d 100644 --- a/frappe/tests/test_assign.py +++ b/frappe/tests/test_assign.py @@ -22,7 +22,7 @@ class TestAssign(unittest.TestCase): self.assertEqual(len(assignments), 0) def test_assignment_count(self): - frappe.db.sql('delete from tabToDo') + frappe.db.delete("ToDo") if not frappe.db.exists("User", "test_assign1@example.com"): frappe.get_doc({"doctype":"User", "email":"test_assign1@example.com", "first_name":"Test", "roles": [{"role": "System Manager"}]}).insert() diff --git a/frappe/tests/test_db_query.py b/frappe/tests/test_db_query.py index 89975b46d6..3724b46d9d 100644 --- a/frappe/tests/test_db_query.py +++ b/frappe/tests/test_db_query.py @@ -105,7 +105,7 @@ class TestReportview(unittest.TestCase): def test_between_filters(self): """ test case to check between filter for date fields """ - frappe.db.sql("delete from tabEvent") + frappe.db.delete("Event") # create events to test the between operator filter todays_event = create_event() diff --git a/frappe/tests/test_domainification.py b/frappe/tests/test_domainification.py index c9acd9ec45..bc972efe1f 100644 --- a/frappe/tests/test_domainification.py +++ b/frappe/tests/test_domainification.py @@ -17,9 +17,9 @@ class TestDomainification(unittest.TestCase): self.add_active_domain("_Test Domain 1") def tearDown(self): - frappe.db.sql("delete from tabRole where name='_Test Role'") - frappe.db.sql("delete from `tabHas Role` where role='_Test Role'") - frappe.db.sql("delete from tabDomain where name in ('_Test Domain 1', '_Test Domain 2')") + frappe.db.delete("Role", {"name": "_Test Role"}) + frappe.db.delete("Has Role", {"role": "_Test Role"}) + frappe.db.delete("Domain", {"name": ("in", ("_Test Domain 1", "_Test Domain 2"))}) frappe.delete_doc('DocType', 'Test Domainification') self.remove_from_active_domains(remove_all=True) diff --git a/frappe/tests/test_dynamic_links.py b/frappe/tests/test_dynamic_links.py index 04ccc91ff2..5ca12ddf13 100644 --- a/frappe/tests/test_dynamic_links.py +++ b/frappe/tests/test_dynamic_links.py @@ -4,7 +4,7 @@ import frappe, unittest class TestDynamicLinks(unittest.TestCase): def setUp(self): - frappe.db.sql('delete from `tabEmail Unsubscribe`') + frappe.db.delete("Email Unsubscribe") def test_delete_normal(self): event = frappe.get_doc({ diff --git a/frappe/tests/test_email.py b/frappe/tests/test_email.py index a837a2c572..68ab80cb8b 100644 --- a/frappe/tests/test_email.py +++ b/frappe/tests/test_email.py @@ -7,9 +7,9 @@ test_dependencies = ['Email Account'] class TestEmail(unittest.TestCase): def setUp(self): - frappe.db.sql("""delete from `tabEmail Unsubscribe`""") - frappe.db.sql("""delete from `tabEmail Queue`""") - frappe.db.sql("""delete from `tabEmail Queue Recipient`""") + frappe.db.delete("Email Unsubscribe") + frappe.db.delete("Email Queue") + frappe.db.delete("Email Queue Recipient") def test_email_queue(self, send_after=None): frappe.sendmail(recipients=['test@example.com', 'test1@example.com'], @@ -170,7 +170,7 @@ class TestEmail(unittest.TestCase): import re email_account = frappe.get_doc('Email Account', '_Test Email Account 1') - frappe.db.sql('''delete from `tabCommunication` where sender = 'sukh@yyy.com' ''') + frappe.db.delete("Communication", {"sender": "sukh@yyy.com"}) with open(frappe.get_app_path('frappe', 'tests', 'data', 'email_with_image.txt'), 'r') as raw: mails = email_account.get_inbound_mails(test_mails=[raw.read()]) diff --git a/frappe/tests/test_frappe_client.py b/frappe/tests/test_frappe_client.py index e1cdbb6ccd..556828f843 100644 --- a/frappe/tests/test_frappe_client.py +++ b/frappe/tests/test_frappe_client.py @@ -12,7 +12,7 @@ import base64 class TestFrappeClient(unittest.TestCase): def test_insert_many(self): server = FrappeClient(get_url(), "Administrator", "admin", verify=False) - frappe.db.sql("delete from `tabNote` where title in ('Sing','a','song','of','sixpence')") + frappe.db.delete("Note", {"title": ("in", ('Sing','a','song','of','sixpence'))}) frappe.db.commit() server.insert_many([ @@ -31,7 +31,7 @@ class TestFrappeClient(unittest.TestCase): def test_create_doc(self): server = FrappeClient(get_url(), "Administrator", "admin", verify=False) - frappe.db.sql("delete from `tabNote` where title = 'test_create'") + frappe.db.delete("Note", {"title": "test_create"}) frappe.db.commit() server.insert({"doctype": "Note", "public": True, "title": "test_create"}) @@ -46,7 +46,7 @@ class TestFrappeClient(unittest.TestCase): def test_get_doc(self): server = FrappeClient(get_url(), "Administrator", "admin", verify=False) - frappe.db.sql("delete from `tabNote` where title = 'get_this'") + frappe.db.delete("Note", {"title": "get_this"}) frappe.db.commit() server.insert_many([ @@ -57,7 +57,7 @@ class TestFrappeClient(unittest.TestCase): def test_get_value(self): server = FrappeClient(get_url(), "Administrator", "admin", verify=False) - frappe.db.sql("delete from `tabNote` where title = 'get_value'") + frappe.db.delete("Note", {"title": "get_value"}) frappe.db.commit() test_content = "test get value" @@ -82,7 +82,7 @@ class TestFrappeClient(unittest.TestCase): def test_update_doc(self): server = FrappeClient(get_url(), "Administrator", "admin", verify=False) - frappe.db.sql("delete from `tabNote` where title in ('Sing','sing')") + frappe.db.delete("Note", {"title": ("in" ("Sing", "sing"))}) frappe.db.commit() server.insert({"doctype":"Note", "public": True, "title": "Sing"}) @@ -94,12 +94,12 @@ class TestFrappeClient(unittest.TestCase): def test_update_child_doc(self): server = FrappeClient(get_url(), "Administrator", "admin", verify=False) - frappe.db.sql("delete from `tabContact` where first_name = 'George' and last_name = 'Steevens'") - frappe.db.sql("delete from `tabContact` where first_name = 'William' and last_name = 'Shakespeare'") - frappe.db.sql("delete from `tabCommunication` where reference_doctype = 'Event'") - frappe.db.sql("delete from `tabCommunication Link` where link_doctype = 'Contact'") - frappe.db.sql("delete from `tabEvent` where subject = 'Sing a song of sixpence'") - frappe.db.sql("delete from `tabEvent Participants` where reference_doctype = 'Contact'") + frappe.db.delete("Contact", {"first_name": "George", "last_name": "Steevens"}) + frappe.db.delete("Contact", {"first_name": "William", "last_name": "Shakespeare"}) + frappe.db.delete("Communication", {"reference_doctype": "Event"}) + frappe.db.delete("Communication Link", {"link_doctype": "Contact"}) + frappe.db.delete("Event", {"subject": "Sing a song of sixpence"}) + frappe.db.delete("Event Participants", {"reference_doctype": "Contact"}) frappe.db.commit() # create multiple contacts @@ -131,7 +131,7 @@ class TestFrappeClient(unittest.TestCase): def test_delete_doc(self): server = FrappeClient(get_url(), "Administrator", "admin", verify=False) - frappe.db.sql("delete from `tabNote` where title = 'delete'") + frappe.db.delete("Note", {"title": "delete"}) frappe.db.commit() server.insert_many([ diff --git a/frappe/tests/test_global_search.py b/frappe/tests/test_global_search.py index 3921af6738..c227abfb99 100644 --- a/frappe/tests/test_global_search.py +++ b/frappe/tests/test_global_search.py @@ -24,15 +24,15 @@ class TestGlobalSearch(unittest.TestCase): make_property_setter(doctype, "repeat_on", "in_global_search", 0, "Int") def tearDown(self): - frappe.db.sql("DELETE FROM `tabProperty Setter` WHERE `doc_type`='Event'") + frappe.db.delete("Property Setter", {"doc_type": "Event"}) frappe.clear_cache(doctype='Event') - frappe.db.sql('DELETE FROM `tabEvent`') - frappe.db.sql('DELETE FROM `__global_search`') + frappe.db.delete("Event") + frappe.db.delete("__global_search") make_test_objects('Event') frappe.db.commit() def insert_test_events(self): - frappe.db.sql('DELETE FROM `tabEvent`') + frappe.db.delete("Event") phrases = ['"The Sixth Extinction II: Amor Fati" is the second episode of the seventh season of the American science fiction.', 'After Mulder awakens from his coma, he realizes his duty to prevent alien colonization. ', 'Carter explored themes of extraterrestrial involvement in ancient mass extinctions in this episode, the third in a trilogy.'] @@ -97,7 +97,7 @@ class TestGlobalSearch(unittest.TestCase): self.assertEqual(len(results), 0) def test_insert_child_table(self): - frappe.db.sql('delete from tabEvent') + frappe.db.delete("Event") phrases = ['Hydrus is a small constellation in the deep southern sky. ', 'It was first depicted on a celestial atlas by Johann Bayer in his 1603 Uranometria. ', 'The French explorer and astronomer Nicolas Louis de Lacaille charted the brighter stars and gave their Bayer designations in 1756. ', diff --git a/frappe/tests/test_goal.py b/frappe/tests/test_goal.py index 5a83baa1af..55b1b9aad8 100644 --- a/frappe/tests/test_goal.py +++ b/frappe/tests/test_goal.py @@ -13,7 +13,7 @@ class TestGoal(unittest.TestCase): make_test_objects('Event', reset=True) def tearDown(self): - frappe.db.sql('delete from `tabEvent`') + frappe.db.delete("Event") # make_test_objects('Event', reset=True) frappe.db.commit() diff --git a/frappe/tests/test_naming.py b/frappe/tests/test_naming.py index 830c39442e..3a8e2445d7 100644 --- a/frappe/tests/test_naming.py +++ b/frappe/tests/test_naming.py @@ -72,7 +72,7 @@ class TestNaming(unittest.TestCase): current_index = frappe.db.sql("""SELECT current from `tabSeries` where name = %s""", series, as_dict=True)[0] self.assertEqual(current_index.get('current'), 0) - frappe.db.sql("""delete from `tabSeries` where name = %s""", series) + frappe.db.delete("Series", {"name": series}) series = 'TEST-{}-'.format(year) key = 'TEST-.YYYY.-.#####' @@ -82,40 +82,40 @@ class TestNaming(unittest.TestCase): current_index = frappe.db.sql("""SELECT current from `tabSeries` where name = %s""", series, as_dict=True)[0] self.assertEqual(current_index.get('current'), 1) - frappe.db.sql("""delete from `tabSeries` where name = %s""", series) + frappe.db.delete("Series", {"name": series}) series = 'TEST-' key = 'TEST-' name = 'TEST-00003' - frappe.db.sql("DELETE FROM `tabSeries` WHERE `name`=%s", series) + frappe.db.delete("Series", {"name": series}) frappe.db.sql("""INSERT INTO `tabSeries` (name, current) values (%s, 3)""", (series,)) revert_series_if_last(key, name) current_index = frappe.db.sql("""SELECT current from `tabSeries` where name = %s""", series, as_dict=True)[0] self.assertEqual(current_index.get('current'), 2) - frappe.db.sql("""delete from `tabSeries` where name = %s""", series) + frappe.db.delete("Series", {"name": series}) series = 'TEST1-' key = 'TEST1-.#####.-2021-22' name = 'TEST1-00003-2021-22' - frappe.db.sql("DELETE FROM `tabSeries` WHERE `name`=%s", series) + frappe.db.delete("Series", {"name": series}) frappe.db.sql("""INSERT INTO `tabSeries` (name, current) values (%s, 3)""", (series,)) revert_series_if_last(key, name) current_index = frappe.db.sql("""SELECT current from `tabSeries` where name = %s""", series, as_dict=True)[0] self.assertEqual(current_index.get('current'), 2) - frappe.db.sql("""delete from `tabSeries` where name = %s""", series) + frappe.db.delete("Series", {"name": series}) series = '' key = '.#####.-2021-22' name = '00003-2021-22' - frappe.db.sql("DELETE FROM `tabSeries` WHERE `name`=%s", series) + frappe.db.delete("Series", {"name": series}) frappe.db.sql("""INSERT INTO `tabSeries` (name, current) values (%s, 3)""", (series,)) revert_series_if_last(key, name) current_index = frappe.db.sql("""SELECT current from `tabSeries` where name = %s""", series, as_dict=True)[0] self.assertEqual(current_index.get('current'), 2) - frappe.db.sql("""delete from `tabSeries` where name = %s""", series) + frappe.db.delete("Series", {"name": series}) def test_naming_for_cancelled_and_amended_doc(self): submittable_doctype = frappe.get_doc({ diff --git a/frappe/tests/test_permissions.py b/frappe/tests/test_permissions.py index ada64156de..9586660535 100644 --- a/frappe/tests/test_permissions.py +++ b/frappe/tests/test_permissions.py @@ -38,7 +38,7 @@ class TestPermissions(unittest.TestCase): reset('Blogger') reset('Blog Post') - frappe.db.sql('delete from `tabUser Permission`') + frappe.db.delete("User Permission") frappe.set_user("test1@example.com") @@ -334,9 +334,9 @@ class TestPermissions(unittest.TestCase): doctype""" frappe.set_user('Administrator') - frappe.db.sql('DELETE FROM `tabContact`') - frappe.db.sql('DELETE FROM `tabContact Email`') - frappe.db.sql('DELETE FROM `tabContact Phone`') + frappe.db.delete("Contact") + frappe.db.delete("Contact Email") + frappe.db.delete("Contact Phone") reset('Salutation') reset('Contact') diff --git a/frappe/tests/test_scheduler.py b/frappe/tests/test_scheduler.py index ec43c08ab7..f13bcbe06f 100644 --- a/frappe/tests/test_scheduler.py +++ b/frappe/tests/test_scheduler.py @@ -45,7 +45,7 @@ class TestScheduler(TestCase): # 1st job is in the queue (or running), don't enqueue it again self.assertFalse(job.enqueue()) - frappe.db.sql('DELETE FROM `tabScheduled Job Log` WHERE `scheduled_job_type`=%s', job.name) + frappe.db.delete("Scheduled Job Log", {"scheduled_job_type": job.name}) def test_is_dormant(self): self.assertTrue(is_dormant(check_time= get_datetime('2100-01-01 00:00:00'))) From ebc220db393e7549cb7d948e57dbb6a92897b35b Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 19 Aug 2021 19:50:48 +0530 Subject: [PATCH 183/306] refactor(tests): frappe.db.delete > frappe.db.sql Use frappe.db.delete wherever possible. Get rid of all the frappe.db.sql ;) This commit focuses on the tests written under the doctype specific tests --- .../assignment_rule/test_assignment_rule.py | 8 ++++---- .../milestone_tracker/test_milestone_tracker.py | 4 ++-- frappe/core/doctype/comment/test_comment.py | 4 ++-- frappe/core/doctype/feedback/test_feedback.py | 4 ++-- .../core/doctype/translation/test_translation.py | 2 +- frappe/core/doctype/user/test_user.py | 6 +++--- frappe/desk/doctype/event/test_event.py | 2 +- frappe/desk/doctype/note/test_note.py | 6 +++--- frappe/desk/doctype/tag/test_tag.py | 2 +- frappe/desk/doctype/todo/test_todo.py | 6 +++--- .../doctype/email_account/test_email_account.py | 12 ++++++------ .../doctype/notification/test_notification.py | 16 ++++++++-------- .../integrations/doctype/webhook/test_webhook.py | 8 ++++---- .../energy_point_log/test_energy_point_log.py | 4 ++-- .../test_personal_data_download_request.py | 4 ++-- frappe/website/doctype/web_page/test_web_page.py | 2 +- .../workflow/doctype/workflow/test_workflow.py | 2 +- 17 files changed, 46 insertions(+), 46 deletions(-) diff --git a/frappe/automation/doctype/assignment_rule/test_assignment_rule.py b/frappe/automation/doctype/assignment_rule/test_assignment_rule.py index e287b83965..dfefd091fb 100644 --- a/frappe/automation/doctype/assignment_rule/test_assignment_rule.py +++ b/frappe/automation/doctype/assignment_rule/test_assignment_rule.py @@ -76,7 +76,7 @@ class TestAutoAssign(unittest.TestCase): # clear 5 assignments for first user # can't do a limit in "delete" since postgres does not support it for d in frappe.get_all('ToDo', dict(reference_type = 'Note', owner = 'test@example.com'), limit=5): - frappe.db.sql("delete from tabToDo where name = %s", d.name) + frappe.db.delete("ToDo", {"name": d.name}) # add 5 more assignments for i in range(5): @@ -177,7 +177,7 @@ class TestAutoAssign(unittest.TestCase): ), 'owner'), 'test@example.com') def check_assignment_rule_scheduling(self): - frappe.db.sql("DELETE FROM `tabAssignment Rule`") + frappe.db.delete("Assignment Rule") days_1 = [dict(day = 'Sunday'), dict(day = 'Monday'), dict(day = 'Tuesday')] @@ -204,7 +204,7 @@ class TestAutoAssign(unittest.TestCase): ), 'owner'), ['test3@example.com']) def test_assignment_rule_condition(self): - frappe.db.sql("DELETE FROM `tabAssignment Rule`") + frappe.db.delete("Assignment Rule") # Add expiry_date custom field from frappe.custom.doctype.custom_field.custom_field import create_custom_field @@ -253,7 +253,7 @@ class TestAutoAssign(unittest.TestCase): assignment_rule.delete() def clear_assignments(): - frappe.db.sql("delete from tabToDo where reference_type = 'Note'") + frappe.db.delete("ToDo", {"reference_type": "Note"}) def get_assignment_rule(days, assign=None): frappe.delete_doc_if_exists('Assignment Rule', 'For Note 1') diff --git a/frappe/automation/doctype/milestone_tracker/test_milestone_tracker.py b/frappe/automation/doctype/milestone_tracker/test_milestone_tracker.py index 21b2779018..1683e94827 100644 --- a/frappe/automation/doctype/milestone_tracker/test_milestone_tracker.py +++ b/frappe/automation/doctype/milestone_tracker/test_milestone_tracker.py @@ -7,7 +7,7 @@ import unittest class TestMilestoneTracker(unittest.TestCase): def test_milestone(self): - frappe.db.sql('delete from `tabMilestone Tracker`') + frappe.db.delete("Milestone Tracker") frappe.cache().delete_key('milestone_tracker_map') @@ -44,5 +44,5 @@ class TestMilestoneTracker(unittest.TestCase): self.assertEqual(milestones[0].value, 'Closed') # cleanup - frappe.db.sql('delete from tabMilestone') + frappe.db.delete("Milestone") milestone_tracker.delete() \ No newline at end of file diff --git a/frappe/core/doctype/comment/test_comment.py b/frappe/core/doctype/comment/test_comment.py index 13db92e7a8..12fe027fba 100644 --- a/frappe/core/doctype/comment/test_comment.py +++ b/frappe/core/doctype/comment/test_comment.py @@ -30,7 +30,7 @@ class TestComment(unittest.TestCase): from frappe.website.doctype.blog_post.test_blog_post import make_test_blog test_blog = make_test_blog() - frappe.db.sql("delete from `tabComment` where reference_doctype = 'Blog Post'") + frappe.db.delete("Comment", {"reference_doctype": "Blog Post"}) from frappe.templates.includes.comments.comments import add_comment add_comment('Good comment with 10 chars', 'test@test.com', 'Good Tester', @@ -41,7 +41,7 @@ class TestComment(unittest.TestCase): reference_name = test_blog.name ))[0].published, 1) - frappe.db.sql("delete from `tabComment` where reference_doctype = 'Blog Post'") + frappe.db.delete("Comment", {"reference_doctype": "Blog Post"}) add_comment('pleez vizits my site http://mysite.com', 'test@test.com', 'bad commentor', 'Blog Post', test_blog.name, test_blog.route) diff --git a/frappe/core/doctype/feedback/test_feedback.py b/frappe/core/doctype/feedback/test_feedback.py index 2a96d86874..c7551420c3 100644 --- a/frappe/core/doctype/feedback/test_feedback.py +++ b/frappe/core/doctype/feedback/test_feedback.py @@ -9,7 +9,7 @@ class TestFeedback(unittest.TestCase): from frappe.website.doctype.blog_post.test_blog_post import make_test_blog test_blog = make_test_blog() - frappe.db.sql("delete from `tabFeedback` where reference_doctype = 'Blog Post'") + frappe.db.delete("Feedback", {"reference_doctype": "Blog Post"}) from frappe.templates.includes.feedback.feedback import add_feedback, update_feedback feedback = add_feedback('Blog Post', test_blog.name, 5, 'New feedback') @@ -22,6 +22,6 @@ class TestFeedback(unittest.TestCase): self.assertEqual(updated_feedback.feedback, 'Updated feedback') self.assertEqual(updated_feedback.rating, 6) - frappe.db.sql("delete from `tabFeedback` where reference_doctype = 'Blog Post'") + frappe.db.delete("Feedback", {"reference_doctype": "Blog Post"}) test_blog.delete() \ No newline at end of file diff --git a/frappe/core/doctype/translation/test_translation.py b/frappe/core/doctype/translation/test_translation.py index ae1293b38f..e5b5d2d393 100644 --- a/frappe/core/doctype/translation/test_translation.py +++ b/frappe/core/doctype/translation/test_translation.py @@ -8,7 +8,7 @@ from frappe import _ class TestTranslation(unittest.TestCase): def setUp(self): - frappe.db.sql('delete from tabTranslation') + frappe.db.delete("Translation") def tearDown(self): frappe.local.lang = 'en' diff --git a/frappe/core/doctype/user/test_user.py b/frappe/core/doctype/user/test_user.py index 392128834d..fbe1830844 100644 --- a/frappe/core/doctype/user/test_user.py +++ b/frappe/core/doctype/user/test_user.py @@ -52,7 +52,7 @@ class TestUser(unittest.TestCase): def test_delete(self): frappe.get_doc("User", "test@example.com").add_roles("_Test Role 2") self.assertRaises(frappe.LinkExistsError, delete_doc, "Role", "_Test Role 2") - frappe.db.sql("""delete from `tabHas Role` where role='_Test Role 2'""") + frappe.db.delete("Has Role", {"role": "_Test Role 2"}) delete_doc("Role","_Test Role 2") if frappe.db.exists("User", "_test@example.com"): @@ -294,5 +294,5 @@ class TestUser(unittest.TestCase): # self.assertIsNone(frappe.db.get("User", {"email": email})) def delete_contact(user): - frappe.db.sql("DELETE FROM `tabContact` WHERE `email_id`= %s", user) - frappe.db.sql("DELETE FROM `tabContact Email` WHERE `email_id`= %s", user) + frappe.db.delete("Contact", {"email_id": user}) + frappe.db.delete("Contact Email", {"email_id": user}) diff --git a/frappe/desk/doctype/event/test_event.py b/frappe/desk/doctype/event/test_event.py index 77211946a9..8f56d11da3 100644 --- a/frappe/desk/doctype/event/test_event.py +++ b/frappe/desk/doctype/event/test_event.py @@ -14,7 +14,7 @@ test_records = frappe.get_test_records('Event') class TestEvent(unittest.TestCase): def setUp(self): - frappe.db.sql('delete from tabEvent') + frappe.db.delete("Event") make_test_objects('Event', reset=True) self.test_records = frappe.get_test_records('Event') diff --git a/frappe/desk/doctype/note/test_note.py b/frappe/desk/doctype/note/test_note.py index 1bb1730357..3207fa9b8d 100644 --- a/frappe/desk/doctype/note/test_note.py +++ b/frappe/desk/doctype/note/test_note.py @@ -8,9 +8,9 @@ test_records = frappe.get_test_records('Note') class TestNote(unittest.TestCase): def insert_note(self): - frappe.db.sql('delete from tabVersion') - frappe.db.sql('delete from tabNote') - frappe.db.sql('delete from `tabNote Seen By`') + frappe.db.delete("Version") + frappe.db.delete("Note") + frappe.db.delete("Note Seen By") return frappe.get_doc(dict(doctype='Note', title='test note', content='test note content')).insert() diff --git a/frappe/desk/doctype/tag/test_tag.py b/frappe/desk/doctype/tag/test_tag.py index 6eb7219c26..b9c6e0b744 100644 --- a/frappe/desk/doctype/tag/test_tag.py +++ b/frappe/desk/doctype/tag/test_tag.py @@ -6,7 +6,7 @@ from frappe.desk.doctype.tag.tag import add_tag class TestTag(unittest.TestCase): def setUp(self) -> None: - frappe.db.sql("DELETE from `tabTag`") + frappe.db.delete("Tag") frappe.db.sql("UPDATE `tabDocType` set _user_tags=''") def test_tag_count_query(self): diff --git a/frappe/desk/doctype/todo/test_todo.py b/frappe/desk/doctype/todo/test_todo.py index b38e4a059a..4afe99597d 100644 --- a/frappe/desk/doctype/todo/test_todo.py +++ b/frappe/desk/doctype/todo/test_todo.py @@ -14,7 +14,7 @@ class TestToDo(unittest.TestCase): todo = frappe.get_doc(dict(doctype='ToDo', description='test todo', assigned_by='Administrator')).insert() - frappe.db.sql('delete from `tabDeleted Document`') + frappe.db.delete("Deleted Document") todo.delete() deleted = frappe.get_doc('Deleted Document', dict(deleted_doctype=todo.doctype, deleted_name=todo.name)) @@ -27,7 +27,7 @@ class TestToDo(unittest.TestCase): frappe.db.get_value('User', todo.assigned_by, 'full_name')) def test_fetch_setup(self): - frappe.db.sql('delete from tabToDo') + frappe.db.delete("ToDo") todo_meta = frappe.get_doc('DocType', 'ToDo') todo_meta.get('fields', dict(fieldname='assigned_by_full_name'))[0].fetch_from = '' @@ -105,7 +105,7 @@ class TestToDo(unittest.TestCase): frappe.db.rollback() def test_fetch_if_empty(self): - frappe.db.sql('delete from tabToDo') + frappe.db.delete("ToDo") # Allow user changes todo_meta = frappe.get_doc('DocType', 'ToDo') diff --git a/frappe/email/doctype/email_account/test_email_account.py b/frappe/email/doctype/email_account/test_email_account.py index 35cacac45a..da03a5959e 100644 --- a/frappe/email/doctype/email_account/test_email_account.py +++ b/frappe/email/doctype/email_account/test_email_account.py @@ -34,8 +34,8 @@ class TestEmailAccount(unittest.TestCase): def setUp(self): frappe.flags.mute_emails = False frappe.flags.sent_mail = None - frappe.db.sql('delete from `tabEmail Queue`') - frappe.db.sql('delete from `tabUnhandled Email`') + frappe.db.delete("Email Queue") + frappe.db.delete("Unhandled Email") def get_test_mail(self, fname): with open(os.path.join(os.path.dirname(__file__), "test_mails", fname), "r") as f: @@ -60,7 +60,7 @@ class TestEmailAccount(unittest.TestCase): comm = frappe.get_doc("Communication", {"sender": "test_sender@example.com"}) comm.db_set("creation", datetime.now() - timedelta(seconds = 30 * 60)) - frappe.db.sql("DELETE FROM `tabEmail Queue`") + frappe.db.delete("Email Queue") notify_unreplied() self.assertTrue(frappe.db.get_value("Email Queue", {"reference_doctype": comm.reference_doctype, "reference_name": comm.reference_name, "status":"Not Sent"})) @@ -183,7 +183,7 @@ class TestEmailAccount(unittest.TestCase): def test_threading_by_message_id(self): cleanup() - frappe.db.sql("""delete from `tabEmail Queue`""") + frappe.db.delete("Email Queue") # reference document for testing event = frappe.get_doc(dict(doctype='Event', subject='test-message')).insert() @@ -242,8 +242,8 @@ class TestInboundMail(unittest.TestCase): def setUp(self): cleanup() - frappe.db.sql('delete from `tabEmail Queue`') - frappe.db.sql('delete from `tabToDo`') + frappe.db.delete("Email Queue") + frappe.db.delete("ToDo") def get_test_mail(self, fname): with open(os.path.join(os.path.dirname(__file__), "test_mails", fname), "r") as f: diff --git a/frappe/email/doctype/notification/test_notification.py b/frappe/email/doctype/notification/test_notification.py index d6358ccbbe..2629050c1b 100644 --- a/frappe/email/doctype/notification/test_notification.py +++ b/frappe/email/doctype/notification/test_notification.py @@ -9,7 +9,7 @@ test_dependencies = ["User", "Notification"] class TestNotification(unittest.TestCase): def setUp(self): - frappe.db.sql("""delete from `tabEmail Queue`""") + frappe.db.delete("Email Queue") frappe.set_user("test@example.com") if not frappe.db.exists('Notification', {'name': 'ToDo Status Update'}, 'name'): @@ -50,7 +50,7 @@ class TestNotification(unittest.TestCase): self.assertTrue(frappe.db.get_value("Email Queue", {"reference_doctype": "Communication", "reference_name": communication.name, "status":"Not Sent"})) - frappe.db.sql("""delete from `tabEmail Queue`""") + frappe.db.delete("Email Queue") communication.reload() communication.content = "test 2" @@ -189,9 +189,9 @@ class TestNotification(unittest.TestCase): def test_cc_jinja(self): - frappe.db.sql("""delete from `tabUser` where email='test_jinja@example.com'""") - frappe.db.sql("""delete from `tabEmail Queue`""") - frappe.db.sql("""delete from `tabEmail Queue Recipient`""") + frappe.db.delete("User", {"email": "test_jinja@example.com"}) + frappe.db.delete("Email Queue") + frappe.db.delete("Email Queue Recipient") test_user = frappe.new_doc("User") test_user.name = 'test_jinja' @@ -205,9 +205,9 @@ class TestNotification(unittest.TestCase): self.assertTrue(frappe.db.get_value("Email Queue Recipient", {"recipient": "test_jinja@example.com"})) - frappe.db.sql("""delete from `tabUser` where email='test_jinja@example.com'""") - frappe.db.sql("""delete from `tabEmail Queue`""") - frappe.db.sql("""delete from `tabEmail Queue Recipient`""") + frappe.db.delete("User", {"email": "test_jinja@example.com"}) + frappe.db.delete("Email Queue") + frappe.db.delete("Email Queue Recipient") def test_notification_to_assignee(self): todo = frappe.new_doc('ToDo') diff --git a/frappe/integrations/doctype/webhook/test_webhook.py b/frappe/integrations/doctype/webhook/test_webhook.py index b77e311f7e..1470f666a1 100644 --- a/frappe/integrations/doctype/webhook/test_webhook.py +++ b/frappe/integrations/doctype/webhook/test_webhook.py @@ -11,9 +11,9 @@ class TestWebhook(unittest.TestCase): @classmethod def setUpClass(cls): # delete any existing webhooks - frappe.db.sql("DELETE FROM tabWebhook") + frappe.db.delete("Webhook") # Delete existing logs if any - frappe.db.sql("DELETE FROM `tabWebhook Request Log`") + frappe.db.delete("Webhook Request Log") # create test webhooks cls.create_sample_webhooks() @@ -46,7 +46,7 @@ class TestWebhook(unittest.TestCase): @classmethod def tearDownClass(cls): # delete any existing webhooks - frappe.db.sql("DELETE FROM tabWebhook") + frappe.db.delete("Webhook") def setUp(self): # retrieve or create a User webhook for `after_insert` @@ -168,7 +168,7 @@ class TestWebhook(unittest.TestCase): def test_webhook_req_log_creation(self): if not frappe.db.get_value('User', 'user2@integration.webhooks.test.com'): user = frappe.get_doc({ - 'doctype': 'User', + 'doctype': 'User', 'email': 'user2@integration.webhooks.test.com', 'first_name': 'user2' }).insert() diff --git a/frappe/social/doctype/energy_point_log/test_energy_point_log.py b/frappe/social/doctype/energy_point_log/test_energy_point_log.py index 4a6e86463e..eb03058760 100644 --- a/frappe/social/doctype/energy_point_log/test_energy_point_log.py +++ b/frappe/social/doctype/energy_point_log/test_energy_point_log.py @@ -13,8 +13,8 @@ class TestEnergyPointLog(unittest.TestCase): def tearDown(self): frappe.set_user('Administrator') - frappe.db.sql('DELETE FROM `tabEnergy Point Log`') - frappe.db.sql('DELETE FROM `tabEnergy Point Rule`') + frappe.db.delete("Energy Point Log") + frappe.db.delete("Energy Point Rule") frappe.cache().delete_value('energy_point_rule_map') def test_user_energy_point(self): diff --git a/frappe/website/doctype/personal_data_download_request/test_personal_data_download_request.py b/frappe/website/doctype/personal_data_download_request/test_personal_data_download_request.py index 563b6b3843..2efac5af12 100644 --- a/frappe/website/doctype/personal_data_download_request/test_personal_data_download_request.py +++ b/frappe/website/doctype/personal_data_download_request/test_personal_data_download_request.py @@ -13,7 +13,7 @@ class TestRequestPersonalData(unittest.TestCase): create_user_if_not_exists(email='test_privacy@example.com') def tearDown(self): - frappe.db.sql("""DELETE FROM `tabPersonal Data Download Request`""") + frappe.db.delete("Personal Data Download Request") def test_user_data_creation(self): user_data = json.loads(get_user_data('test_privacy@example.com')) @@ -45,7 +45,7 @@ class TestRequestPersonalData(unittest.TestCase): limit=1) self.assertTrue("Subject: Download Your Data" in email_queue[0].message) - frappe.db.sql("delete from `tabEmail Queue`") + frappe.db.delete("Email Queue") def create_user_if_not_exists(email, first_name = None): frappe.delete_doc_if_exists("User", email) diff --git a/frappe/website/doctype/web_page/test_web_page.py b/frappe/website/doctype/web_page/test_web_page.py index 0d36d0f870..aebc6a38c1 100644 --- a/frappe/website/doctype/web_page/test_web_page.py +++ b/frappe/website/doctype/web_page/test_web_page.py @@ -8,7 +8,7 @@ test_records = frappe.get_test_records('Web Page') class TestWebPage(unittest.TestCase): def setUp(self): - frappe.db.sql("delete from `tabWeb Page`") + frappe.db.delete("Web Page") for t in test_records: frappe.get_doc(t).insert() diff --git a/frappe/workflow/doctype/workflow/test_workflow.py b/frappe/workflow/doctype/workflow/test_workflow.py index cd36fd2d0b..fb19352c67 100644 --- a/frappe/workflow/doctype/workflow/test_workflow.py +++ b/frappe/workflow/doctype/workflow/test_workflow.py @@ -76,7 +76,7 @@ class TestWorkflow(unittest.TestCase): self.assertListEqual(actions, ['Review']) def test_if_workflow_actions_were_processed(self): - frappe.db.sql('delete from `tabWorkflow Action`') + frappe.db.delete("Workflow Action") user = frappe.get_doc('User', 'test2@example.com') user.add_roles('Test Approver', 'System Manager') frappe.set_user('test2@example.com') From 32c6cf1c443c1c522848736da25cc0b22aea1425 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 19 Aug 2021 19:53:16 +0530 Subject: [PATCH 184/306] refactor(misc): frappe.db.delete > frappe.db.sql Use frappe.db.delete wherever possible. Get rid of all the frappe.db.sql ;) This commit focuses on the pending modules that had relatively easier DELETE statements. --- frappe/model/delete_doc.py | 9 +++++---- frappe/model/document.py | 3 +-- frappe/modules/utils.py | 3 +-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/frappe/model/delete_doc.py b/frappe/model/delete_doc.py index fbbf1a4852..16fc960260 100644 --- a/frappe/model/delete_doc.py +++ b/frappe/model/delete_doc.py @@ -190,7 +190,7 @@ def delete_from_table(doctype, name, ignore_doctypes, doc): # delete from child tables for t in list(set(tables)): if t not in ignore_doctypes: - frappe.db.sql("delete from `tab%s` where parenttype=%s and parent = %s" % (t, '%s', '%s'), (doctype, name)) + frappe.db.delete(t, {"parenttype": doctype, "parent": name}) def update_flags(doc, flags=None, ignore_permissions=False): if ignore_permissions: @@ -323,9 +323,10 @@ def delete_dynamic_links(doctype, name): def delete_references(doctype, reference_doctype, reference_name, reference_doctype_field = 'reference_doctype', reference_name_field = 'reference_name'): - frappe.db.sql('''delete from `tab{0}` - where {1}=%s and {2}=%s'''.format(doctype, reference_doctype_field, reference_name_field), # nosec - (reference_doctype, reference_name)) + frappe.db.delete(doctype, { + reference_doctype_field: reference_doctype, + reference_name_field: reference_name + }) def clear_references(doctype, reference_doctype, reference_name, reference_doctype_field = 'reference_doctype', reference_name_field = 'reference_name'): diff --git a/frappe/model/document.py b/frappe/model/document.py index ee12fd89e0..37549e2001 100644 --- a/frappe/model/document.py +++ b/frappe/model/document.py @@ -385,8 +385,7 @@ class Document(BaseDocument): [self.name, self.doctype, fieldname] + rows) if len(deleted_rows) > 0: # delete rows that do not match the ones in the document - frappe.db.sql("""delete from `tab{0}` where name in ({1})""".format(df.options, - ','.join(['%s'] * len(deleted_rows))), tuple(row[0] for row in deleted_rows)) + frappe.db.delete(df.options, {"name": ("in", tuple(row[0] for row in deleted_rows))}) else: # no rows found, delete all rows diff --git a/frappe/modules/utils.py b/frappe/modules/utils.py index 0f3e57a5a0..ed2a839dc1 100644 --- a/frappe/modules/utils.py +++ b/frappe/modules/utils.py @@ -114,8 +114,7 @@ def sync_customizations_for_doctype(data, folder): doc.db_insert() if custom_doctype != 'Custom Field': - frappe.db.sql('delete from `tab{0}` where `{1}` =%s'.format( - custom_doctype, doctype_fieldname), doc_type) + frappe.db.delete(custom_doctype, {doctype_fieldname: doc_type}) for d in data[key]: _insert(d) From 4df118906f66dd7d06b6b85063f80dc157704862 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 19 Aug 2021 20:10:11 +0530 Subject: [PATCH 185/306] fix: Run test skipped earlier due to missing indent --- frappe/desk/doctype/todo/test_todo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/desk/doctype/todo/test_todo.py b/frappe/desk/doctype/todo/test_todo.py index 4afe99597d..7e0fa115c9 100644 --- a/frappe/desk/doctype/todo/test_todo.py +++ b/frappe/desk/doctype/todo/test_todo.py @@ -104,7 +104,7 @@ class TestToDo(unittest.TestCase): clear_permissions_cache('ToDo') frappe.db.rollback() -def test_fetch_if_empty(self): + def test_fetch_if_empty(self): frappe.db.delete("ToDo") # Allow user changes From b7e42fdc910592e3b0a55500914420eb6668c4e8 Mon Sep 17 00:00:00 2001 From: Komal-Saraf0609 Date: Tue, 10 Aug 2021 18:53:20 +0530 Subject: [PATCH 186/306] test: Added test cases for folder navigation and checking if the nested folder contains the added file --- cypress/integration/folder_navigation.js | 79 ++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 cypress/integration/folder_navigation.js diff --git a/cypress/integration/folder_navigation.js b/cypress/integration/folder_navigation.js new file mode 100644 index 0000000000..4a389101b5 --- /dev/null +++ b/cypress/integration/folder_navigation.js @@ -0,0 +1,79 @@ +context('Folder Navigation', () => { + before(() => { + cy.visit('/login'); + cy.login(); + cy.visit('/app/file'); + }); + + it('Adding Folders', () => { + //Adding filter to go into the home folder + cy.get('.filter-selector > .btn').click(); + cy.get('.filter-action-buttons > div > .btn-secondary').contains('Clear Filters').click(); + cy.get('.filter-action-buttons > .text-muted').click(); + cy.get('.fieldname-select-area > .awesomplete > .form-control').type('Fol{enter}'); + cy.get('.filter-field > .form-group > .link-field > .awesomplete > .input-with-feedback').type('Home{enter}'); + cy.get('.filter-action-buttons > div > .btn-primary').click(); + + //Adding folder (Test Folder) + cy.get('.menu-btn-group > .btn').click(); + cy.get('.menu-btn-group > .dropdown-menu > .user-action > .grey-link').eq(2).click(); + cy.get('form > .frappe-control > .form-group > .control-input-wrapper > .control-input > .input-with-feedback').type('Test Folder'); + cy.get('.modal-footer > .standard-actions > .btn-primary').click(); + }); + + it('Navigating the nested folders, checking if the URL formed is correct, checking if the added content in the child folder is correct', () => { + //Navigating inside the Attachments folder + cy.get('[title="Attachments"] > span').click(); + + //To check if the URL formed after visiting the attachments folder is correct + cy.location('pathname').should('eq', '/app/file/view/home/Attachments'); + cy.visit('/app/file/view/home/Attachments'); + + //Adding folder inside the attachments folder + cy.get('.menu-btn-group > .btn').click(); + cy.get('.menu-btn-group > .dropdown-menu > .user-action > .grey-link').eq(2).click(); + cy.get('form > .frappe-control > .form-group > .control-input-wrapper > .control-input > .input-with-feedback').type('Test Folder'); + cy.get('.modal-footer > .standard-actions > .btn-primary').click(); + + //Navigating inside the added folder in the Attachments folder + cy.get('[title="Test Folder"] > span').click(); + + //To check if the URL is correct after visiting the Test Folder + cy.location('pathname').should('eq', '/app/file/view/home/Attachments/Test%20Folder'); + cy.visit('/app/file/view/home/Attachments/Test%20Folder'); + + //Adding a file inside the Test Folder + cy.get('.primary-action').contains('Add File').eq(0).click({force : true}); + cy.get('.mt-2 > .btn > .mt-1').eq(2).click(); + cy.get('.input-group > .form-control').type('https://wallpaperplay.com/walls/full/8/2/b/72402.jpg'); + cy.get('.btn-primary').contains('Upload').click(); + + //To check if the added file is present in the Test Folder + cy.get('span.level-item > span').should('contain','Test Folder'); + cy.get('.list-row-container').eq(0).should('contain.text','72402.jpg'); + cy.get('.list-row-checkbox').eq(0).click(); + + //Deleting the added file from the Test folder + cy.get('.actions-btn-group > .btn').click(); + cy.get('.actions-btn-group > .dropdown-menu > li > .grey-link').eq(5).click(); + cy.wait(700); + cy.click_modal_primary_button('Yes', {force : true, delay: 700}); + cy.wait(700); + + //Deleting the Test Folder + cy.visit('/app/file/view/home/Attachments'); + cy.get('.list-row-checkbox').eq(0).click(); + cy.get('.actions-btn-group > .btn').click(); + cy.get('.actions-btn-group > .dropdown-menu > li > .grey-link').eq(5).click(); + cy.click_modal_primary_button('Yes'); + }); + + it('Deleting Test Folder from the home', () => { + //Deleting the Test Folder added in the home directory + cy.visit('/app/file/view/home'); + cy.get('.list-row-container > .list-row > .level-left > .list-subject > .list-row-checkbox').eq(0).click({force : true, delay : 500}); + cy.get('.actions-btn-group > .btn').click(); + cy.get('.actions-btn-group > .dropdown-menu > li > .grey-link').eq(5).click(); + cy.click_modal_primary_button('Yes', {force : true}); + }); +}); \ No newline at end of file From a881e85cb36e634bb3af0301736d87273089eb2c Mon Sep 17 00:00:00 2001 From: Komal-Saraf0609 Date: Tue, 10 Aug 2021 19:10:27 +0530 Subject: [PATCH 187/306] test: Fixed sider issues --- cypress/integration/folder_navigation.js | 122 +++++++++++------------ 1 file changed, 61 insertions(+), 61 deletions(-) diff --git a/cypress/integration/folder_navigation.js b/cypress/integration/folder_navigation.js index 4a389101b5..d4fe569828 100644 --- a/cypress/integration/folder_navigation.js +++ b/cypress/integration/folder_navigation.js @@ -5,75 +5,75 @@ context('Folder Navigation', () => { cy.visit('/app/file'); }); - it('Adding Folders', () => { - //Adding filter to go into the home folder - cy.get('.filter-selector > .btn').click(); - cy.get('.filter-action-buttons > div > .btn-secondary').contains('Clear Filters').click(); - cy.get('.filter-action-buttons > .text-muted').click(); - cy.get('.fieldname-select-area > .awesomplete > .form-control').type('Fol{enter}'); - cy.get('.filter-field > .form-group > .link-field > .awesomplete > .input-with-feedback').type('Home{enter}'); - cy.get('.filter-action-buttons > div > .btn-primary').click(); - - //Adding folder (Test Folder) - cy.get('.menu-btn-group > .btn').click(); - cy.get('.menu-btn-group > .dropdown-menu > .user-action > .grey-link').eq(2).click(); - cy.get('form > .frappe-control > .form-group > .control-input-wrapper > .control-input > .input-with-feedback').type('Test Folder'); - cy.get('.modal-footer > .standard-actions > .btn-primary').click(); - }); + it('Adding Folders', () => { + //Adding filter to go into the home folder + cy.get('.filter-selector > .btn').click(); + cy.get('.filter-action-buttons > div > .btn-secondary').contains('Clear Filters').click(); + cy.get('.filter-action-buttons > .text-muted').click(); + cy.get('.fieldname-select-area > .awesomplete > .form-control').type('Fol{enter}'); + cy.get('.filter-field > .form-group > .link-field > .awesomplete > .input-with-feedback').type('Home{enter}'); + cy.get('.filter-action-buttons > div > .btn-primary').click(); - it('Navigating the nested folders, checking if the URL formed is correct, checking if the added content in the child folder is correct', () => { - //Navigating inside the Attachments folder - cy.get('[title="Attachments"] > span').click(); + //Adding folder (Test Folder) + cy.get('.menu-btn-group > .btn').click(); + cy.get('.menu-btn-group > .dropdown-menu > .user-action > .grey-link').eq(2).click(); + cy.get('form > .frappe-control > .form-group > .control-input-wrapper > .control-input > .input-with-feedback').type('Test Folder'); + cy.get('.modal-footer > .standard-actions > .btn-primary').click(); + }); + + it('Navigating the nested folders, checking if the URL formed is correct, checking if the added content in the child folder is correct', () => { + //Navigating inside the Attachments folder + cy.get('[title="Attachments"] > span').click(); - //To check if the URL formed after visiting the attachments folder is correct - cy.location('pathname').should('eq', '/app/file/view/home/Attachments'); - cy.visit('/app/file/view/home/Attachments'); + //To check if the URL formed after visiting the attachments folder is correct + cy.location('pathname').should('eq', '/app/file/view/home/Attachments'); + cy.visit('/app/file/view/home/Attachments'); - //Adding folder inside the attachments folder - cy.get('.menu-btn-group > .btn').click(); - cy.get('.menu-btn-group > .dropdown-menu > .user-action > .grey-link').eq(2).click(); - cy.get('form > .frappe-control > .form-group > .control-input-wrapper > .control-input > .input-with-feedback').type('Test Folder'); - cy.get('.modal-footer > .standard-actions > .btn-primary').click(); + //Adding folder inside the attachments folder + cy.get('.menu-btn-group > .btn').click(); + cy.get('.menu-btn-group > .dropdown-menu > .user-action > .grey-link').eq(2).click(); + cy.get('form > .frappe-control > .form-group > .control-input-wrapper > .control-input > .input-with-feedback').type('Test Folder'); + cy.get('.modal-footer > .standard-actions > .btn-primary').click(); - //Navigating inside the added folder in the Attachments folder - cy.get('[title="Test Folder"] > span').click(); + //Navigating inside the added folder in the Attachments folder + cy.get('[title="Test Folder"] > span').click(); - //To check if the URL is correct after visiting the Test Folder - cy.location('pathname').should('eq', '/app/file/view/home/Attachments/Test%20Folder'); - cy.visit('/app/file/view/home/Attachments/Test%20Folder'); + //To check if the URL is correct after visiting the Test Folder + cy.location('pathname').should('eq', '/app/file/view/home/Attachments/Test%20Folder'); + cy.visit('/app/file/view/home/Attachments/Test%20Folder'); - //Adding a file inside the Test Folder - cy.get('.primary-action').contains('Add File').eq(0).click({force : true}); - cy.get('.mt-2 > .btn > .mt-1').eq(2).click(); - cy.get('.input-group > .form-control').type('https://wallpaperplay.com/walls/full/8/2/b/72402.jpg'); - cy.get('.btn-primary').contains('Upload').click(); + //Adding a file inside the Test Folder + cy.get('.primary-action').contains('Add File').eq(0).click({force: true}); + cy.get('.mt-2 > .btn > .mt-1').eq(2).click(); + cy.get('.input-group > .form-control').type('https://wallpaperplay.com/walls/full/8/2/b/72402.jpg'); + cy.get('.btn-primary').contains('Upload').click(); - //To check if the added file is present in the Test Folder - cy.get('span.level-item > span').should('contain','Test Folder'); - cy.get('.list-row-container').eq(0).should('contain.text','72402.jpg'); - cy.get('.list-row-checkbox').eq(0).click(); + //To check if the added file is present in the Test Folder + cy.get('span.level-item > span').should('contain', 'Test Folder'); + cy.get('.list-row-container').eq(0).should('contain.text', '72402.jpg'); + cy.get('.list-row-checkbox').eq(0).click(); - //Deleting the added file from the Test folder - cy.get('.actions-btn-group > .btn').click(); - cy.get('.actions-btn-group > .dropdown-menu > li > .grey-link').eq(5).click(); - cy.wait(700); - cy.click_modal_primary_button('Yes', {force : true, delay: 700}); - cy.wait(700); + //Deleting the added file from the Test folder + cy.get('.actions-btn-group > .btn').click(); + cy.get('.actions-btn-group > .dropdown-menu > li > .grey-link').eq(5).click(); + cy.wait(700); + cy.click_modal_primary_button('Yes', {force: true, delay: 700}); + cy.wait(700); - //Deleting the Test Folder - cy.visit('/app/file/view/home/Attachments'); - cy.get('.list-row-checkbox').eq(0).click(); - cy.get('.actions-btn-group > .btn').click(); - cy.get('.actions-btn-group > .dropdown-menu > li > .grey-link').eq(5).click(); - cy.click_modal_primary_button('Yes'); - }); + //Deleting the Test Folder + cy.visit('/app/file/view/home/Attachments'); + cy.get('.list-row-checkbox').eq(0).click(); + cy.get('.actions-btn-group > .btn').click(); + cy.get('.actions-btn-group > .dropdown-menu > li > .grey-link').eq(5).click(); + cy.click_modal_primary_button('Yes'); + }); - it('Deleting Test Folder from the home', () => { - //Deleting the Test Folder added in the home directory - cy.visit('/app/file/view/home'); - cy.get('.list-row-container > .list-row > .level-left > .list-subject > .list-row-checkbox').eq(0).click({force : true, delay : 500}); - cy.get('.actions-btn-group > .btn').click(); - cy.get('.actions-btn-group > .dropdown-menu > li > .grey-link').eq(5).click(); - cy.click_modal_primary_button('Yes', {force : true}); - }); + it('Deleting Test Folder from the home', () => { + //Deleting the Test Folder added in the home directory + cy.visit('/app/file/view/home'); + cy.get('.list-row-container > .list-row > .level-left > .list-subject > .list-row-checkbox').eq(0).click({force: true, delay: 500}); + cy.get('.actions-btn-group > .btn').click(); + cy.get('.actions-btn-group > .dropdown-menu > li > .grey-link').eq(5).click(); + cy.click_modal_primary_button('Yes', {force: true}); + }); }); \ No newline at end of file From 9fce3c60943ea003f719ca5a809b399cb13efb96 Mon Sep 17 00:00:00 2001 From: Komal-Saraf0609 Date: Thu, 8 Jul 2021 18:57:34 +0530 Subject: [PATCH 188/306] test: Added test cases for Email testing --- cypress/integration/email_testing.js | 44 ++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 cypress/integration/email_testing.js diff --git a/cypress/integration/email_testing.js b/cypress/integration/email_testing.js new file mode 100644 index 0000000000..15cc895600 --- /dev/null +++ b/cypress/integration/email_testing.js @@ -0,0 +1,44 @@ +context('Email Feature Test', () => { + before(() => { + cy.visit('/login'); + cy.login(); + cy.visit('/app/todo'); + }); + + it('Saving and Deleting Email Template', () => { + cy.get('.level-item.ellipsis > .ellipsis').click(); + cy.get('.timeline-actions > .btn').click(); + cy.fill_field('recipients','test@example.com','MultiSelect'); + cy.get('.modal.show > .modal-dialog > .modal-content > .modal-body > :nth-child(1) > .form-layout > .form-page > :nth-child(3) > .section-body > .form-column > form > [data-fieldtype="Text Editor"] > .form-group > .control-input-wrapper > .control-input > .ql-container > .ql-editor').type('Test Mail'); + + cy.get('.add-more-attachments > .btn').click(); + cy.get('.mt-2 > .btn > .mt-1').eq(2).click(); + cy.get('.input-group > .form-control').type('https://wallpaperplay.com/walls/full/8/2/b/72402.jpg'); + cy.get('.btn-primary').contains('Upload').click(); + cy.get('.modal-footer > .standard-actions > .btn-primary').contains('Send').click({delay:500}); + cy.get('[data-doctype="Communication"] > .timeline-content').should('contain','Test Mail'); + cy.get('.timeline-content').should('contain','Added 72402.jpg'); + cy.get('[title="Open Communication"] > .icon').click(); + cy.get('#page-Communication > .page-head > .container > .row > .col > .standard-actions > .menu-btn-group > .btn').click(); + cy.get('#page-Communication > .page-head > .container > .row > .col > .standard-actions > .menu-btn-group > .dropdown-menu > :nth-child(11) > .grey-link').click(); + cy.get('.modal.show > .modal-dialog > .modal-content > .modal-footer > .standard-actions > .btn-primary').click(); + cy.visit('/app/todo'); + cy.get('.level-item.ellipsis > .ellipsis').click(); + cy.get('.attachment-row > .data-pill > .remove-btn > .icon').click(); + cy.get('.modal-footer > .standard-actions > .btn-primary').contains('Yes').click(); + cy.get('.timeline-content').should('contain','Removed 72402.jpg'); + }); + + it('Discarding Email Template', () => { + cy.visit('/app/todo'); + cy.get('.level-item.ellipsis > .ellipsis').click(); + cy.get('.timeline-actions > .btn').click(); + cy.fill_field('recipients','test@example.com','MultiSelect'); + cy.get('.modal-footer > .standard-actions > .btn-secondary').contains('Discard').click(); + cy.get('.timeline-actions > .btn').click(); + cy.get_field('recipients','MultiSelect').should('have.value',''); + cy.get('.modal.show > .modal-dialog > .modal-content > .modal-header > .modal-actions > .btn-modal-close > .icon').click(); + }); + + +}); From f047a5517daea95a1408061fe9d47786aec94d74 Mon Sep 17 00:00:00 2001 From: Komal-Saraf0609 Date: Thu, 19 Aug 2021 20:24:03 +0530 Subject: [PATCH 189/306] test: corrected the selectors and shorten them (using the newly added API's) --- cypress/integration/folder_navigation.js | 134 +++++++++++------------ 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/cypress/integration/folder_navigation.js b/cypress/integration/folder_navigation.js index d4fe569828..1ff38005ad 100644 --- a/cypress/integration/folder_navigation.js +++ b/cypress/integration/folder_navigation.js @@ -1,79 +1,79 @@ context('Folder Navigation', () => { - before(() => { - cy.visit('/login'); - cy.login(); - cy.visit('/app/file'); - }); - - it('Adding Folders', () => { - //Adding filter to go into the home folder - cy.get('.filter-selector > .btn').click(); - cy.get('.filter-action-buttons > div > .btn-secondary').contains('Clear Filters').click(); - cy.get('.filter-action-buttons > .text-muted').click(); - cy.get('.fieldname-select-area > .awesomplete > .form-control').type('Fol{enter}'); - cy.get('.filter-field > .form-group > .link-field > .awesomplete > .input-with-feedback').type('Home{enter}'); - cy.get('.filter-action-buttons > div > .btn-primary').click(); + before(() => { + cy.visit('/login'); + cy.login(); + cy.visit('/app/file'); + }); - //Adding folder (Test Folder) - cy.get('.menu-btn-group > .btn').click(); - cy.get('.menu-btn-group > .dropdown-menu > .user-action > .grey-link').eq(2).click(); - cy.get('form > .frappe-control > .form-group > .control-input-wrapper > .control-input > .input-with-feedback').type('Test Folder'); - cy.get('.modal-footer > .standard-actions > .btn-primary').click(); - }); + it('Adding Folders', () => { + //Adding filter to go into the home folder + cy.get('.filter-selector > .btn').click(); + cy.findByRole('button', {name: 'Clear Filters'}).click(); + cy.get('.filter-action-buttons > .text-muted').click(); + cy.get('.fieldname-select-area > .awesomplete > .form-control').type('Fol{enter}'); + cy.get('.filter-field > .form-group > .link-field > .awesomplete > .input-with-feedback').type('Home{enter}'); + cy.get('.filter-action-buttons > div > .btn-primary').click(); - it('Navigating the nested folders, checking if the URL formed is correct, checking if the added content in the child folder is correct', () => { - //Navigating inside the Attachments folder - cy.get('[title="Attachments"] > span').click(); + //Adding folder (Test Folder) + cy.get('.menu-btn-group > .btn').click(); + cy.get('.menu-btn-group [data-label="New Folder"]').click(); + cy.get('form > [data-fieldname="value"]').type('Test Folder'); + cy.findByRole('button', {name: 'Create'}).click(); + }); - //To check if the URL formed after visiting the attachments folder is correct - cy.location('pathname').should('eq', '/app/file/view/home/Attachments'); - cy.visit('/app/file/view/home/Attachments'); + it('Navigating the nested folders, checking if the URL formed is correct, checking if the added content in the child folder is correct', () => { + //Navigating inside the Attachments folder + cy.get('[title="Attachments"] > span').click(); - //Adding folder inside the attachments folder - cy.get('.menu-btn-group > .btn').click(); - cy.get('.menu-btn-group > .dropdown-menu > .user-action > .grey-link').eq(2).click(); - cy.get('form > .frappe-control > .form-group > .control-input-wrapper > .control-input > .input-with-feedback').type('Test Folder'); - cy.get('.modal-footer > .standard-actions > .btn-primary').click(); + //To check if the URL formed after visiting the attachments folder is correct + cy.location('pathname').should('eq', '/app/file/view/home/Attachments'); + cy.visit('/app/file/view/home/Attachments'); - //Navigating inside the added folder in the Attachments folder - cy.get('[title="Test Folder"] > span').click(); + //Adding folder inside the attachments folder + cy.get('.menu-btn-group > .btn').click(); + cy.get('.menu-btn-group [data-label="New Folder"]').click(); + cy.get('form > [data-fieldname="value"]').type('Test Folder'); + cy.findByRole('button', {name: 'Create'}).click(); - //To check if the URL is correct after visiting the Test Folder - cy.location('pathname').should('eq', '/app/file/view/home/Attachments/Test%20Folder'); - cy.visit('/app/file/view/home/Attachments/Test%20Folder'); + //Navigating inside the added folder in the Attachments folder + cy.get('[title="Test Folder"] > span').click(); - //Adding a file inside the Test Folder - cy.get('.primary-action').contains('Add File').eq(0).click({force: true}); - cy.get('.mt-2 > .btn > .mt-1').eq(2).click(); - cy.get('.input-group > .form-control').type('https://wallpaperplay.com/walls/full/8/2/b/72402.jpg'); - cy.get('.btn-primary').contains('Upload').click(); + //To check if the URL is correct after visiting the Test Folder + cy.location('pathname').should('eq', '/app/file/view/home/Attachments/Test%20Folder'); + cy.visit('/app/file/view/home/Attachments/Test%20Folder'); - //To check if the added file is present in the Test Folder - cy.get('span.level-item > span').should('contain', 'Test Folder'); - cy.get('.list-row-container').eq(0).should('contain.text', '72402.jpg'); - cy.get('.list-row-checkbox').eq(0).click(); + //Adding a file inside the Test Folder + cy.findByRole('button', {name: 'Add File'}).eq(0).click({force: true}); + cy.get('.mt-2 > .btn > .mt-1').eq(2).click(); + cy.get('.input-group > .form-control').type('https://wallpaperplay.com/walls/full/8/2/b/72402.jpg'); + cy.findByRole('button', {name: 'Upload'}).click(); - //Deleting the added file from the Test folder - cy.get('.actions-btn-group > .btn').click(); - cy.get('.actions-btn-group > .dropdown-menu > li > .grey-link').eq(5).click(); - cy.wait(700); - cy.click_modal_primary_button('Yes', {force: true, delay: 700}); - cy.wait(700); + //To check if the added file is present in the Test Folder + cy.get('span.level-item > span').should('contain', 'Test Folder'); + cy.get('.list-row-container').eq(0).should('contain.text', '72402.jpg'); + cy.get('.list-row-checkbox').eq(0).click(); - //Deleting the Test Folder - cy.visit('/app/file/view/home/Attachments'); - cy.get('.list-row-checkbox').eq(0).click(); - cy.get('.actions-btn-group > .btn').click(); - cy.get('.actions-btn-group > .dropdown-menu > li > .grey-link').eq(5).click(); - cy.click_modal_primary_button('Yes'); - }); + //Deleting the added file from the Test folder + cy.findByRole('button', {name: 'Actions'}).click(); + cy.get('.actions-btn-group [data-label="Delete"]').click(); + cy.wait(700); + cy.findByRole('button', {name: 'Yes'}).click(); + cy.wait(700); - it('Deleting Test Folder from the home', () => { - //Deleting the Test Folder added in the home directory - cy.visit('/app/file/view/home'); - cy.get('.list-row-container > .list-row > .level-left > .list-subject > .list-row-checkbox').eq(0).click({force: true, delay: 500}); - cy.get('.actions-btn-group > .btn').click(); - cy.get('.actions-btn-group > .dropdown-menu > li > .grey-link').eq(5).click(); - cy.click_modal_primary_button('Yes', {force: true}); - }); -}); \ No newline at end of file + //Deleting the Test Folder + cy.visit('/app/file/view/home/Attachments'); + cy.get('.list-row-checkbox').eq(0).click(); + cy.findByRole('button', {name: 'Actions'}).click(); + cy.get('.actions-btn-group [data-label="Delete"]').click(); + cy.findByRole('button', {name: 'Yes'}).click(); + }); + + it('Deleting Test Folder from the home', () => { + //Deleting the Test Folder added in the home directory + cy.visit('/app/file/view/home'); + cy.get('.level-left > .list-subject > .list-row-checkbox').eq(0).click({force: true, delay: 500}); + cy.findByRole('button', {name: 'Actions'}).click(); + cy.get('.actions-btn-group [data-label="Delete"]').click(); + cy.findByRole('button', {name: 'Yes'}).click(); + }); +}); From 380e9e7c080a616a34090992e910632a4daa0ff6 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 19 Aug 2021 20:30:13 +0530 Subject: [PATCH 190/306] fix(test): Add missing comma --- frappe/tests/test_frappe_client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/tests/test_frappe_client.py b/frappe/tests/test_frappe_client.py index 556828f843..d192952e92 100644 --- a/frappe/tests/test_frappe_client.py +++ b/frappe/tests/test_frappe_client.py @@ -82,7 +82,7 @@ class TestFrappeClient(unittest.TestCase): def test_update_doc(self): server = FrappeClient(get_url(), "Administrator", "admin", verify=False) - frappe.db.delete("Note", {"title": ("in" ("Sing", "sing"))}) + frappe.db.delete("Note", {"title": ("in", ("Sing", "sing"))}) frappe.db.commit() server.insert({"doctype":"Note", "public": True, "title": "Sing"}) From 8a6b8a5348d48444d8acc278bcfe83c844dbf246 Mon Sep 17 00:00:00 2001 From: Komal-Saraf0609 Date: Thu, 19 Aug 2021 20:41:31 +0530 Subject: [PATCH 191/306] test: corrected selectors and shorten them (using the newly added API's) --- cypress/integration/folder_navigation.js | 81 ------------------------ 1 file changed, 81 deletions(-) diff --git a/cypress/integration/folder_navigation.js b/cypress/integration/folder_navigation.js index 987bddce7c..1ff38005ad 100644 --- a/cypress/integration/folder_navigation.js +++ b/cypress/integration/folder_navigation.js @@ -1,5 +1,4 @@ context('Folder Navigation', () => { -<<<<<<< HEAD before(() => { cy.visit('/login'); cy.login(); @@ -78,83 +77,3 @@ context('Folder Navigation', () => { cy.findByRole('button', {name: 'Yes'}).click(); }); }); -======= - before(() => { - cy.visit('/login'); - cy.login(); - cy.visit('/app/file'); - }); - - it('Adding Folders', () => { - //Adding filter to go into the home folder - cy.get('.filter-selector > .btn').click(); - cy.get('.filter-action-buttons > div > .btn-secondary').contains('Clear Filters').click(); - cy.get('.filter-action-buttons > .text-muted').click(); - cy.get('.fieldname-select-area > .awesomplete > .form-control').type('Fol{enter}'); - cy.get('.filter-field > .form-group > .link-field > .awesomplete > .input-with-feedback').type('Home{enter}'); - cy.get('.filter-action-buttons > div > .btn-primary').click(); - - //Adding folder (Test Folder) - cy.get('.menu-btn-group > .btn').click(); - cy.get('.menu-btn-group > .dropdown-menu > .user-action > .grey-link').eq(2).click(); - cy.get('form > .frappe-control > .form-group > .control-input-wrapper > .control-input > .input-with-feedback').type('Test Folder'); - cy.get('.modal-footer > .standard-actions > .btn-primary').click(); - }); - - it('Navigating the nested folders, checking if the URL formed is correct, checking if the added content in the child folder is correct', () => { - //Navigating inside the Attachments folder - cy.get('[title="Attachments"] > span').click(); - - //To check if the URL formed after visiting the attachments folder is correct - cy.location('pathname').should('eq', '/app/file/view/home/Attachments'); - cy.visit('/app/file/view/home/Attachments'); - - //Adding folder inside the attachments folder - cy.get('.menu-btn-group > .btn').click(); - cy.get('.menu-btn-group > .dropdown-menu > .user-action > .grey-link').eq(2).click(); - cy.get('form > .frappe-control > .form-group > .control-input-wrapper > .control-input > .input-with-feedback').type('Test Folder'); - cy.get('.modal-footer > .standard-actions > .btn-primary').click(); - - //Navigating inside the added folder in the Attachments folder - cy.get('[title="Test Folder"] > span').click(); - - //To check if the URL is correct after visiting the Test Folder - cy.location('pathname').should('eq', '/app/file/view/home/Attachments/Test%20Folder'); - cy.visit('/app/file/view/home/Attachments/Test%20Folder'); - - //Adding a file inside the Test Folder - cy.get('.primary-action').contains('Add File').eq(0).click({force: true}); - cy.get('.mt-2 > .btn > .mt-1').eq(2).click(); - cy.get('.input-group > .form-control').type('https://wallpaperplay.com/walls/full/8/2/b/72402.jpg'); - cy.get('.btn-primary').contains('Upload').click(); - - //To check if the added file is present in the Test Folder - cy.get('span.level-item > span').should('contain', 'Test Folder'); - cy.get('.list-row-container').eq(0).should('contain.text', '72402.jpg'); - cy.get('.list-row-checkbox').eq(0).click(); - - //Deleting the added file from the Test folder - cy.get('.actions-btn-group > .btn').click(); - cy.get('.actions-btn-group > .dropdown-menu > li > .grey-link').eq(5).click(); - cy.wait(700); - cy.click_modal_primary_button('Yes', {force: true, delay: 700}); - cy.wait(700); - - //Deleting the Test Folder - cy.visit('/app/file/view/home/Attachments'); - cy.get('.list-row-checkbox').eq(0).click(); - cy.get('.actions-btn-group > .btn').click(); - cy.get('.actions-btn-group > .dropdown-menu > li > .grey-link').eq(5).click(); - cy.click_modal_primary_button('Yes'); - }); - - it('Deleting Test Folder from the home', () => { - //Deleting the Test Folder added in the home directory - cy.visit('/app/file/view/home'); - cy.get('.list-row-container > .list-row > .level-left > .list-subject > .list-row-checkbox').eq(0).click({force: true, delay: 500}); - cy.get('.actions-btn-group > .btn').click(); - cy.get('.actions-btn-group > .dropdown-menu > li > .grey-link').eq(5).click(); - cy.click_modal_primary_button('Yes', {force: true}); - }); -}); ->>>>>>> 166574b1d065ac0c0461a671d7fe837a9d35b7ce From b8f28fd28b94bc97011b1761b96059978728a53f Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 19 Aug 2021 20:47:27 +0530 Subject: [PATCH 192/306] test(todo): Use doc.meta instead of doctype form --- frappe/desk/doctype/todo/test_todo.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/frappe/desk/doctype/todo/test_todo.py b/frappe/desk/doctype/todo/test_todo.py index 7e0fa115c9..f6371c5921 100644 --- a/frappe/desk/doctype/todo/test_todo.py +++ b/frappe/desk/doctype/todo/test_todo.py @@ -122,9 +122,8 @@ class TestToDo(unittest.TestCase): self.assertEqual(todo.assigned_by_full_name, 'Admin') # Overwrite user changes - todo_meta = frappe.get_doc('DocType', 'ToDo') - todo_meta.get('fields', dict(fieldname='assigned_by_full_name'))[0].fetch_if_empty = 0 - todo_meta.save() + todo.meta.get('fields', dict(fieldname='assigned_by_full_name'))[0].fetch_if_empty = 0 + todo.meta.save() todo.reload() todo.save() From 533b0147b28b069bd3d4ed4c41e4d20528b6a572 Mon Sep 17 00:00:00 2001 From: Komal-Saraf0609 Date: Thu, 19 Aug 2021 20:58:12 +0530 Subject: [PATCH 193/306] test: Fixed sider issues --- cypress/integration/folder_navigation.js | 130 +++++++++++------------ 1 file changed, 65 insertions(+), 65 deletions(-) diff --git a/cypress/integration/folder_navigation.js b/cypress/integration/folder_navigation.js index 1ff38005ad..09df8d2d20 100644 --- a/cypress/integration/folder_navigation.js +++ b/cypress/integration/folder_navigation.js @@ -1,79 +1,79 @@ context('Folder Navigation', () => { - before(() => { - cy.visit('/login'); - cy.login(); - cy.visit('/app/file'); - }); + before(() => { + cy.visit('/login'); + cy.login(); + cy.visit('/app/file'); + }); - it('Adding Folders', () => { - //Adding filter to go into the home folder - cy.get('.filter-selector > .btn').click(); - cy.findByRole('button', {name: 'Clear Filters'}).click(); - cy.get('.filter-action-buttons > .text-muted').click(); - cy.get('.fieldname-select-area > .awesomplete > .form-control').type('Fol{enter}'); - cy.get('.filter-field > .form-group > .link-field > .awesomplete > .input-with-feedback').type('Home{enter}'); - cy.get('.filter-action-buttons > div > .btn-primary').click(); + it('Adding Folders', () => { + //Adding filter to go into the home folder + cy.get('.filter-selector > .btn').click(); + cy.findByRole('button', {name: 'Clear Filters'}).click(); + cy.get('.filter-action-buttons > .text-muted').click(); + cy.get('.fieldname-select-area > .awesomplete > .form-control').type('Fol{enter}'); + cy.get('.filter-field > .form-group > .link-field > .awesomplete > .input-with-feedback').type('Home{enter}'); + cy.get('.filter-action-buttons > div > .btn-primary').click(); - //Adding folder (Test Folder) - cy.get('.menu-btn-group > .btn').click(); - cy.get('.menu-btn-group [data-label="New Folder"]').click(); - cy.get('form > [data-fieldname="value"]').type('Test Folder'); - cy.findByRole('button', {name: 'Create'}).click(); - }); + //Adding folder (Test Folder) + cy.get('.menu-btn-group > .btn').click(); + cy.get('.menu-btn-group [data-label="New Folder"]').click(); + cy.get('form > [data-fieldname="value"]').type('Test Folder'); + cy.findByRole('button', {name: 'Create'}).click(); + }); - it('Navigating the nested folders, checking if the URL formed is correct, checking if the added content in the child folder is correct', () => { - //Navigating inside the Attachments folder - cy.get('[title="Attachments"] > span').click(); + it('Navigating the nested folders, checking if the URL formed is correct, checking if the added content in the child folder is correct', () => { + //Navigating inside the Attachments folder + cy.get('[title="Attachments"] > span').click(); - //To check if the URL formed after visiting the attachments folder is correct - cy.location('pathname').should('eq', '/app/file/view/home/Attachments'); - cy.visit('/app/file/view/home/Attachments'); + //To check if the URL formed after visiting the attachments folder is correct + cy.location('pathname').should('eq', '/app/file/view/home/Attachments'); + cy.visit('/app/file/view/home/Attachments'); - //Adding folder inside the attachments folder - cy.get('.menu-btn-group > .btn').click(); - cy.get('.menu-btn-group [data-label="New Folder"]').click(); - cy.get('form > [data-fieldname="value"]').type('Test Folder'); - cy.findByRole('button', {name: 'Create'}).click(); + //Adding folder inside the attachments folder + cy.get('.menu-btn-group > .btn').click(); + cy.get('.menu-btn-group [data-label="New Folder"]').click(); + cy.get('form > [data-fieldname="value"]').type('Test Folder'); + cy.findByRole('button', {name: 'Create'}).click(); - //Navigating inside the added folder in the Attachments folder - cy.get('[title="Test Folder"] > span').click(); + //Navigating inside the added folder in the Attachments folder + cy.get('[title="Test Folder"] > span').click(); - //To check if the URL is correct after visiting the Test Folder - cy.location('pathname').should('eq', '/app/file/view/home/Attachments/Test%20Folder'); - cy.visit('/app/file/view/home/Attachments/Test%20Folder'); + //To check if the URL is correct after visiting the Test Folder + cy.location('pathname').should('eq', '/app/file/view/home/Attachments/Test%20Folder'); + cy.visit('/app/file/view/home/Attachments/Test%20Folder'); - //Adding a file inside the Test Folder - cy.findByRole('button', {name: 'Add File'}).eq(0).click({force: true}); - cy.get('.mt-2 > .btn > .mt-1').eq(2).click(); - cy.get('.input-group > .form-control').type('https://wallpaperplay.com/walls/full/8/2/b/72402.jpg'); - cy.findByRole('button', {name: 'Upload'}).click(); + //Adding a file inside the Test Folder + cy.findByRole('button', {name: 'Add File'}).eq(0).click({force: true}); + cy.get('.mt-2 > .btn > .mt-1').eq(2).click(); + cy.get('.input-group > .form-control').type('https://wallpaperplay.com/walls/full/8/2/b/72402.jpg'); + cy.findByRole('button', {name: 'Upload'}).click(); - //To check if the added file is present in the Test Folder - cy.get('span.level-item > span').should('contain', 'Test Folder'); - cy.get('.list-row-container').eq(0).should('contain.text', '72402.jpg'); - cy.get('.list-row-checkbox').eq(0).click(); + //To check if the added file is present in the Test Folder + cy.get('span.level-item > span').should('contain', 'Test Folder'); + cy.get('.list-row-container').eq(0).should('contain.text', '72402.jpg'); + cy.get('.list-row-checkbox').eq(0).click(); - //Deleting the added file from the Test folder - cy.findByRole('button', {name: 'Actions'}).click(); - cy.get('.actions-btn-group [data-label="Delete"]').click(); - cy.wait(700); - cy.findByRole('button', {name: 'Yes'}).click(); - cy.wait(700); + //Deleting the added file from the Test folder + cy.findByRole('button', {name: 'Actions'}).click(); + cy.get('.actions-btn-group [data-label="Delete"]').click(); + cy.wait(700); + cy.findByRole('button', {name: 'Yes'}).click(); + cy.wait(700); - //Deleting the Test Folder - cy.visit('/app/file/view/home/Attachments'); - cy.get('.list-row-checkbox').eq(0).click(); - cy.findByRole('button', {name: 'Actions'}).click(); - cy.get('.actions-btn-group [data-label="Delete"]').click(); - cy.findByRole('button', {name: 'Yes'}).click(); - }); + //Deleting the Test Folder + cy.visit('/app/file/view/home/Attachments'); + cy.get('.list-row-checkbox').eq(0).click(); + cy.findByRole('button', {name: 'Actions'}).click(); + cy.get('.actions-btn-group [data-label="Delete"]').click(); + cy.findByRole('button', {name: 'Yes'}).click(); + }); - it('Deleting Test Folder from the home', () => { - //Deleting the Test Folder added in the home directory - cy.visit('/app/file/view/home'); - cy.get('.level-left > .list-subject > .list-row-checkbox').eq(0).click({force: true, delay: 500}); - cy.findByRole('button', {name: 'Actions'}).click(); - cy.get('.actions-btn-group [data-label="Delete"]').click(); - cy.findByRole('button', {name: 'Yes'}).click(); - }); + it('Deleting Test Folder from the home', () => { + //Deleting the Test Folder added in the home directory + cy.visit('/app/file/view/home'); + cy.get('.level-left > .list-subject > .list-row-checkbox').eq(0).click({force: true, delay: 500}); + cy.findByRole('button', {name: 'Actions'}).click(); + cy.get('.actions-btn-group [data-label="Delete"]').click(); + cy.findByRole('button', {name: 'Yes'}).click(); + }); }); From a8846d52df900ae71539cc0b06f83ec0aad96833 Mon Sep 17 00:00:00 2001 From: Komal-Saraf0609 Date: Thu, 19 Aug 2021 21:04:02 +0530 Subject: [PATCH 194/306] test: Fixed sider issues --- cypress/integration/email_testing.js | 66 ++++++++++++++-------------- 1 file changed, 32 insertions(+), 34 deletions(-) diff --git a/cypress/integration/email_testing.js b/cypress/integration/email_testing.js index 15cc895600..cdc7a90af5 100644 --- a/cypress/integration/email_testing.js +++ b/cypress/integration/email_testing.js @@ -5,40 +5,38 @@ context('Email Feature Test', () => { cy.visit('/app/todo'); }); - it('Saving and Deleting Email Template', () => { - cy.get('.level-item.ellipsis > .ellipsis').click(); - cy.get('.timeline-actions > .btn').click(); - cy.fill_field('recipients','test@example.com','MultiSelect'); - cy.get('.modal.show > .modal-dialog > .modal-content > .modal-body > :nth-child(1) > .form-layout > .form-page > :nth-child(3) > .section-body > .form-column > form > [data-fieldtype="Text Editor"] > .form-group > .control-input-wrapper > .control-input > .ql-container > .ql-editor').type('Test Mail'); - - cy.get('.add-more-attachments > .btn').click(); - cy.get('.mt-2 > .btn > .mt-1').eq(2).click(); - cy.get('.input-group > .form-control').type('https://wallpaperplay.com/walls/full/8/2/b/72402.jpg'); - cy.get('.btn-primary').contains('Upload').click(); - cy.get('.modal-footer > .standard-actions > .btn-primary').contains('Send').click({delay:500}); - cy.get('[data-doctype="Communication"] > .timeline-content').should('contain','Test Mail'); - cy.get('.timeline-content').should('contain','Added 72402.jpg'); - cy.get('[title="Open Communication"] > .icon').click(); - cy.get('#page-Communication > .page-head > .container > .row > .col > .standard-actions > .menu-btn-group > .btn').click(); - cy.get('#page-Communication > .page-head > .container > .row > .col > .standard-actions > .menu-btn-group > .dropdown-menu > :nth-child(11) > .grey-link').click(); - cy.get('.modal.show > .modal-dialog > .modal-content > .modal-footer > .standard-actions > .btn-primary').click(); - cy.visit('/app/todo'); - cy.get('.level-item.ellipsis > .ellipsis').click(); - cy.get('.attachment-row > .data-pill > .remove-btn > .icon').click(); - cy.get('.modal-footer > .standard-actions > .btn-primary').contains('Yes').click(); - cy.get('.timeline-content').should('contain','Removed 72402.jpg'); - }); + it('Saving and Deleting Email Template', () => { + cy.get('.level-item.ellipsis > .ellipsis').click(); + cy.get('.timeline-actions > .btn').click(); + cy.fill_field('recipients','test@example.com','MultiSelect'); + cy.get('.modal.show > .modal-dialog > .modal-content > .modal-body > :nth-child(1) > .form-layout > .form-page > :nth-child(3) > .section-body > .form-column > form > [data-fieldtype="Text Editor"] > .form-group > .control-input-wrapper > .control-input > .ql-container > .ql-editor').type('Test Mail'); - it('Discarding Email Template', () => { - cy.visit('/app/todo'); - cy.get('.level-item.ellipsis > .ellipsis').click(); - cy.get('.timeline-actions > .btn').click(); - cy.fill_field('recipients','test@example.com','MultiSelect'); - cy.get('.modal-footer > .standard-actions > .btn-secondary').contains('Discard').click(); - cy.get('.timeline-actions > .btn').click(); - cy.get_field('recipients','MultiSelect').should('have.value',''); - cy.get('.modal.show > .modal-dialog > .modal-content > .modal-header > .modal-actions > .btn-modal-close > .icon').click(); - }); + cy.get('.add-more-attachments > .btn').click(); + cy.get('.mt-2 > .btn > .mt-1').eq(2).click(); + cy.get('.input-group > .form-control').type('https://wallpaperplay.com/walls/full/8/2/b/72402.jpg'); + cy.get('.btn-primary').contains('Upload').click(); + cy.get('.modal-footer > .standard-actions > .btn-primary').contains('Send').click({delay:500}); + cy.get('[data-doctype="Communication"] > .timeline-content').should('contain','Test Mail'); + cy.get('.timeline-content').should('contain','Added 72402.jpg'); + cy.get('[title="Open Communication"] > .icon').click(); + cy.get('#page-Communication > .page-head > .container > .row > .col > .standard-actions > .menu-btn-group > .btn').click(); + cy.get('#page-Communication > .page-head > .container > .row > .col > .standard-actions > .menu-btn-group > .dropdown-menu > :nth-child(11) > .grey-link').click(); + cy.get('.modal.show > .modal-dialog > .modal-content > .modal-footer > .standard-actions > .btn-primary').click(); + cy.visit('/app/todo'); + cy.get('.level-item.ellipsis > .ellipsis').click(); + cy.get('.attachment-row > .data-pill > .remove-btn > .icon').click(); + cy.get('.modal-footer > .standard-actions > .btn-primary').contains('Yes').click(); + cy.get('.timeline-content').should('contain','Removed 72402.jpg'); + }); - + it('Discarding Email Template', () => { + cy.visit('/app/todo'); + cy.get('.level-item.ellipsis > .ellipsis').click(); + cy.get('.timeline-actions > .btn').click(); + cy.fill_field('recipients','test@example.com','MultiSelect'); + cy.get('.modal-footer > .standard-actions > .btn-secondary').contains('Discard').click(); + cy.get('.timeline-actions > .btn').click(); + cy.get_field('recipients','MultiSelect').should('have.value',''); + cy.get('.modal.show > .modal-dialog > .modal-content > .modal-header > .modal-actions > .btn-modal-close > .icon').click(); + }); }); From f53622d21ecd69a1565354fd6b540f5d4b2db84c Mon Sep 17 00:00:00 2001 From: Komal-Saraf0609 Date: Thu, 19 Aug 2021 21:10:08 +0530 Subject: [PATCH 195/306] test: Deleted the file email_testing.js --- cypress/integration/email_testing.js | 42 ---------------------------- 1 file changed, 42 deletions(-) delete mode 100644 cypress/integration/email_testing.js diff --git a/cypress/integration/email_testing.js b/cypress/integration/email_testing.js deleted file mode 100644 index cdc7a90af5..0000000000 --- a/cypress/integration/email_testing.js +++ /dev/null @@ -1,42 +0,0 @@ -context('Email Feature Test', () => { - before(() => { - cy.visit('/login'); - cy.login(); - cy.visit('/app/todo'); - }); - - it('Saving and Deleting Email Template', () => { - cy.get('.level-item.ellipsis > .ellipsis').click(); - cy.get('.timeline-actions > .btn').click(); - cy.fill_field('recipients','test@example.com','MultiSelect'); - cy.get('.modal.show > .modal-dialog > .modal-content > .modal-body > :nth-child(1) > .form-layout > .form-page > :nth-child(3) > .section-body > .form-column > form > [data-fieldtype="Text Editor"] > .form-group > .control-input-wrapper > .control-input > .ql-container > .ql-editor').type('Test Mail'); - - cy.get('.add-more-attachments > .btn').click(); - cy.get('.mt-2 > .btn > .mt-1').eq(2).click(); - cy.get('.input-group > .form-control').type('https://wallpaperplay.com/walls/full/8/2/b/72402.jpg'); - cy.get('.btn-primary').contains('Upload').click(); - cy.get('.modal-footer > .standard-actions > .btn-primary').contains('Send').click({delay:500}); - cy.get('[data-doctype="Communication"] > .timeline-content').should('contain','Test Mail'); - cy.get('.timeline-content').should('contain','Added 72402.jpg'); - cy.get('[title="Open Communication"] > .icon').click(); - cy.get('#page-Communication > .page-head > .container > .row > .col > .standard-actions > .menu-btn-group > .btn').click(); - cy.get('#page-Communication > .page-head > .container > .row > .col > .standard-actions > .menu-btn-group > .dropdown-menu > :nth-child(11) > .grey-link').click(); - cy.get('.modal.show > .modal-dialog > .modal-content > .modal-footer > .standard-actions > .btn-primary').click(); - cy.visit('/app/todo'); - cy.get('.level-item.ellipsis > .ellipsis').click(); - cy.get('.attachment-row > .data-pill > .remove-btn > .icon').click(); - cy.get('.modal-footer > .standard-actions > .btn-primary').contains('Yes').click(); - cy.get('.timeline-content').should('contain','Removed 72402.jpg'); - }); - - it('Discarding Email Template', () => { - cy.visit('/app/todo'); - cy.get('.level-item.ellipsis > .ellipsis').click(); - cy.get('.timeline-actions > .btn').click(); - cy.fill_field('recipients','test@example.com','MultiSelect'); - cy.get('.modal-footer > .standard-actions > .btn-secondary').contains('Discard').click(); - cy.get('.timeline-actions > .btn').click(); - cy.get_field('recipients','MultiSelect').should('have.value',''); - cy.get('.modal.show > .modal-dialog > .modal-content > .modal-header > .modal-actions > .btn-modal-close > .icon').click(); - }); -}); From 36f698f0f8d7040966d31f12f4b9ca4f4c7976a7 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 19 Aug 2021 21:38:57 +0530 Subject: [PATCH 196/306] fix: Unzip functionality --- frappe/core/doctype/file/file.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index 8d0eee8c69..a31119961d 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -319,12 +319,10 @@ class File(Document): def unzip(self): '''Unzip current file and replace it by its children''' - if not ".zip" in self.file_name: - frappe.msgprint(_("Not a zip file")) - return + if not ".zip" in self.file_url: + frappe.throw(_("{0} is not a zip file").format(self.file_name)) - zip_path = frappe.get_site_path(self.file_url.strip('/')) - base_url = os.path.dirname(self.file_url) + zip_path = self.get_full_path() files = [] with zipfile.ZipFile(zip_path) as z: @@ -837,7 +835,7 @@ def unzip_file(name): '''Unzip the given file and make file records for each of the extracted files''' file_obj = frappe.get_doc('File', name) files = file_obj.unzip() - return len(files) + return files @frappe.whitelist() def optimize_saved_image(doc_name): From 3acab8a7c7da04184ad5828a042250356cdfe8e3 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 19 Aug 2021 21:40:12 +0530 Subject: [PATCH 197/306] test: Add test cases for unzip functionality --- frappe/core/doctype/file/test_file.py | 23 +++++++++++++++++++++++ frappe/www/_test/assets/file.zip | Bin 0 -> 156164 bytes 2 files changed, 23 insertions(+) create mode 100644 frappe/www/_test/assets/file.zip diff --git a/frappe/core/doctype/file/test_file.py b/frappe/core/doctype/file/test_file.py index df0ba8c2ec..f17c52150a 100644 --- a/frappe/core/doctype/file/test_file.py +++ b/frappe/core/doctype/file/test_file.py @@ -418,6 +418,29 @@ class TestFile(unittest.TestCase): self.assertEqual(json.loads(frappe.message_log[0]), {"message": f"File '{frappe.utils.get_url('unknown.jpg')}' not found"}) self.assertEquals(test_file.thumbnail_url, None) + def test_file_unzip(self): + file_path = frappe.get_app_path('frappe', 'www/_test/assets/file.zip') + public_file_path = frappe.get_site_path('public', 'files') + try: + import shutil + shutil.copy(file_path, public_file_path) + except Exception as e: + print(e) + + test_file = frappe.get_doc({ + "doctype": "File", + "file_url": '/files/file.zip', + }).insert(ignore_permissions=True) + + self.assertListEqual([file.file_name for file in unzip_file(test_file.name)], + ['css_asset.css', 'image.jpg', 'js_asset.min.js']) + + test_file = frappe.get_doc({ + "doctype": "File", + "file_url": frappe.utils.get_url('/_test/assets/image.jpg'), + }).insert(ignore_permissions=True) + self.assertRaisesRegex(frappe.exceptions.ValidationError, 'not a zip file', test_file.unzip) + class TestAttachment(unittest.TestCase): test_doctype = 'Test For Attachment' diff --git a/frappe/www/_test/assets/file.zip b/frappe/www/_test/assets/file.zip new file mode 100644 index 0000000000000000000000000000000000000000..06d70919d4b19cc415ed795b8a897a7fb9fba08b GIT binary patch literal 156164 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 W80cK0`U`N0baj%n60`ricK-)q-D;2k literal 0 HcmV?d00001 From ed41602526db31d7e12b33d6a26fdd3161fd7ba6 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 19 Aug 2021 21:43:43 +0530 Subject: [PATCH 198/306] test: Add more assersions and minor refactor --- frappe/core/doctype/file/file.py | 7 ++++--- frappe/core/doctype/file/test_file.py | 13 +++++++++---- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index a31119961d..06222872a6 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -257,7 +257,7 @@ class File(Document): with open(get_files_path(file_name, is_private=self.is_private), "rb") as f: self.content_hash = get_content_hash(f.read()) except IOError: - frappe.msgprint(_("File {0} does not exist").format(self.file_url)) + frappe.throw(_("File {0} does not exist").format(self.file_url)) raise def on_trash(self): @@ -559,7 +559,8 @@ def create_new_folder(file_name, folder): file.file_name = file_name file.is_folder = 1 file.folder = folder - file.insert() + file.insert(ignore_if_duplicate=True) + return file @frappe.whitelist() def move_file(file_list, new_parent, old_parent): @@ -610,7 +611,7 @@ def get_local_image(file_url): try: image = Image.open(file_path) except IOError: - frappe.msgprint(_("Unable to read file format for {0}").format(file_url), raise_exception=True) + frappe.throw(_("Unable to read file format for {0}").format(file_url)) content = None diff --git a/frappe/core/doctype/file/test_file.py b/frappe/core/doctype/file/test_file.py index f17c52150a..e054aed950 100644 --- a/frappe/core/doctype/file/test_file.py +++ b/frappe/core/doctype/file/test_file.py @@ -7,7 +7,7 @@ import frappe import os import unittest from frappe import _ -from frappe.core.doctype.file.file import move_file, get_files_in_folder +from frappe.core.doctype.file.file import get_attached_images, move_file, get_files_in_folder, unzip_file from frappe.utils import get_files_path # test_records = frappe.get_test_records('File') @@ -397,7 +397,6 @@ class TestFile(unittest.TestCase): "doctype": "File", "file_name": 'logo', "file_url": frappe.utils.get_url('/_test/assets/image.jpg'), - "docstatus": 0 }).insert(ignore_permissions=True) test_file.make_thumbnail() @@ -407,7 +406,7 @@ class TestFile(unittest.TestCase): test_file.db_set('thumbnail_url', None) test_file.reload() test_file.file_url = "/files/image_small.jpg" - test_file.make_thumbnail(suffix="xs") + test_file.make_thumbnail(suffix="xs", crop=True) self.assertEquals(test_file.thumbnail_url, '/files/image_small_xs.jpg') frappe.clear_messages() @@ -556,6 +555,7 @@ class TestFileUtils(unittest.TestCase): }).insert() self.assertTrue(frappe.db.exists("File", {"attached_to_name": todo.name})) self.assertIn('', todo.description) + self.assertListEqual(get_attached_images('ToDo', [todo.name])[todo.name], ['/files/pix.png']) # without filename in data URI todo = frappe.get_doc({ @@ -563,4 +563,9 @@ class TestFileUtils(unittest.TestCase): "description": 'Test ' }).insert() filename = frappe.db.exists("File", {"attached_to_name": todo.name}) - self.assertIn(f' Date: Thu, 19 Aug 2021 22:04:23 +0530 Subject: [PATCH 199/306] test: Fix typo --- frappe/core/doctype/file/test_file.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/frappe/core/doctype/file/test_file.py b/frappe/core/doctype/file/test_file.py index e054aed950..f9d06429ff 100644 --- a/frappe/core/doctype/file/test_file.py +++ b/frappe/core/doctype/file/test_file.py @@ -423,8 +423,8 @@ class TestFile(unittest.TestCase): try: import shutil shutil.copy(file_path, public_file_path) - except Exception as e: - print(e) + except Exception: + pass test_file = frappe.get_doc({ "doctype": "File", @@ -567,5 +567,11 @@ class TestFileUtils(unittest.TestCase): def test_create_new_folder(self): from frappe.core.doctype.file.file import create_new_folder - folder = create_new_folder('test_folder', 'home') + folder = create_new_folder('test_folder', 'Home') self.assertTrue(folder.is_folder) + +# def get_files_by_search_text(text): +# def optimize_saved_image(doc_name): +# def download_file(file_url): +# def remove_file_by_url(file_url, doctype=None, name=None): +# def on_doctype_update(): \ No newline at end of file From 228253289f8ee6e670c4868d97ce1bc25da818e6 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 20 Aug 2021 09:55:26 +0530 Subject: [PATCH 200/306] fix: Only select active numeric field after layout refresh --- frappe/public/js/frappe/form/layout.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/frappe/public/js/frappe/form/layout.js b/frappe/public/js/frappe/form/layout.js index 88e0463fa5..f171c4f32e 100644 --- a/frappe/public/js/frappe/form/layout.js +++ b/frappe/public/js/frappe/form/layout.js @@ -252,14 +252,18 @@ frappe.ui.form.Layout = class Layout { } if (document.activeElement) { - document.activeElement.focus(); - - if (document.activeElement.tagName == 'INPUT') { + if (document.activeElement.tagName == 'INPUT' && this.is_numeric_field_active()) { document.activeElement.select(); } } } + is_numeric_field_active() { + const control = $(document.activeElement).closest(".frappe-control") + const fieldtype = control.data().fieldtype; + return frappe.model.numeric_fieldtypes.includes(fieldtype) + } + refresh_sections() { // hide invisible sections this.wrapper.find(".form-section:not(.hide-control)").each(function() { From 32148cadc51d24771fe98871a7816d8f5e50b4de Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 20 Aug 2021 09:58:23 +0530 Subject: [PATCH 201/306] fix: Avoid input events for controls in grid --- frappe/public/js/frappe/form/controls/data.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/controls/data.js b/frappe/public/js/frappe/form/controls/data.js index e4a7dd6d59..864a0562ef 100644 --- a/frappe/public/js/frappe/form/controls/data.js +++ b/frappe/public/js/frappe/form/controls/data.js @@ -163,7 +163,7 @@ frappe.ui.form.ControlData = class ControlData extends frappe.ui.form.ControlInp } }; this.$input.on("change", change_handler); - if (this.constructor.trigger_change_on_input_event) { + if (this.constructor.trigger_change_on_input_event && !this.in_grid()) { // debounce to avoid repeated validations on value change this.$input.on("input", frappe.utils.debounce(change_handler, 500)); } @@ -267,4 +267,7 @@ frappe.ui.form.ControlData = class ControlData extends frappe.ui.form.ControlInp let el = this.$input.parents(el_class)[0]; if (el) $(el).toggleClass(scroll_class, add); } + in_grid() { + return this.grid || this.layout && this.layout.grid; + } }; From ff552d5d1d61fc83568bd213cc537c9bc5a623c2 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 20 Aug 2021 10:02:44 +0530 Subject: [PATCH 202/306] perf: Reduce debounce delay --- frappe/public/js/frappe/form/grid.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js index 8de1600c05..05c70b214d 100644 --- a/frappe/public/js/frappe/form/grid.js +++ b/frappe/public/js/frappe/form/grid.js @@ -38,7 +38,7 @@ export default class Grid { this.is_grid = true; this.debounced_refresh = this.refresh.bind(this); - this.debounced_refresh = frappe.utils.debounce(this.debounced_refresh, 500); + this.debounced_refresh = frappe.utils.debounce(this.debounced_refresh, 100); } allow_on_grid_editing() { From ebcb3618cf95e7c9a65c3d7dea40b8cd84b32f34 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 20 Aug 2021 10:23:49 +0530 Subject: [PATCH 203/306] style: Add missing semicolons --- frappe/public/js/frappe/form/layout.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/form/layout.js b/frappe/public/js/frappe/form/layout.js index f171c4f32e..21d7a451ac 100644 --- a/frappe/public/js/frappe/form/layout.js +++ b/frappe/public/js/frappe/form/layout.js @@ -259,9 +259,9 @@ frappe.ui.form.Layout = class Layout { } is_numeric_field_active() { - const control = $(document.activeElement).closest(".frappe-control") + const control = $(document.activeElement).closest(".frappe-control"); const fieldtype = control.data().fieldtype; - return frappe.model.numeric_fieldtypes.includes(fieldtype) + return frappe.model.numeric_fieldtypes.includes(fieldtype); } refresh_sections() { From 623998c787314dfd0eb70b41d2bb26a418de3624 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 20 Aug 2021 11:03:06 +0530 Subject: [PATCH 204/306] fix(db): Cast single dt field only if value is truthy --- frappe/database/database.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frappe/database/database.py b/frappe/database/database.py index d6ecf0795d..d4fc6c2219 100644 --- a/frappe/database/database.py +++ b/frappe/database/database.py @@ -557,7 +557,10 @@ class Database(object): if not df: frappe.throw(_('Invalid field name: {0}').format(frappe.bold(fieldname)), self.InvalidColumnName) - val = cast_fieldtype(df.fieldtype, val) + # cast only if value is "set" or is truthy? + # cast_fieldtype returns currnt TS value for Datetime, Date fields + if val: + val = cast_fieldtype(df.fieldtype, val) self.value_cache[doctype][fieldname] = val From 09868c26a9687f5b35339772be1db42d58951b06 Mon Sep 17 00:00:00 2001 From: Pruthvi Patel Date: Fri, 20 Aug 2021 11:41:41 +0530 Subject: [PATCH 205/306] feat: add `--autoreload` flag --- frappe/commands/utils.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/frappe/commands/utils.py b/frappe/commands/utils.py index 765028dfed..35e566794f 100644 --- a/frappe/commands/utils.py +++ b/frappe/commands/utils.py @@ -486,8 +486,13 @@ frappe.db.connect() @click.command('console') +@click.option( + '--autoreload', + is_flag=True, + help="Reload changes to code automatically" +) @pass_context -def console(context): +def console(context, autoreload=False): "Start ipython console for a site" site = get_site(context) frappe.init(site=site) @@ -497,7 +502,7 @@ def console(context): from IPython.terminal.embed import InteractiveShellEmbed terminal = InteractiveShellEmbed() - if frappe.conf.developer_mode: + if autoreload: terminal.extension_manager.load_extension("autoreload") terminal.run_line_magic("autoreload", "2") From cb034e4c52e2213cdbe5f5a053e8a1bec169ebd9 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 20 Aug 2021 12:08:39 +0530 Subject: [PATCH 206/306] fix: Consistent return types in cast_fieldtype Note: BREAKING CHANGE --- frappe/database/database.py | 5 +---- frappe/utils/data.py | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/frappe/database/database.py b/frappe/database/database.py index d4fc6c2219..d6ecf0795d 100644 --- a/frappe/database/database.py +++ b/frappe/database/database.py @@ -557,10 +557,7 @@ class Database(object): if not df: frappe.throw(_('Invalid field name: {0}').format(frappe.bold(fieldname)), self.InvalidColumnName) - # cast only if value is "set" or is truthy? - # cast_fieldtype returns currnt TS value for Datetime, Date fields - if val: - val = cast_fieldtype(df.fieldtype, val) + val = cast_fieldtype(df.fieldtype, val) self.value_cache[doctype][fieldname] = val diff --git a/frappe/utils/data.py b/frappe/utils/data.py index f2c553211d..d89cda1519 100644 --- a/frappe/utils/data.py +++ b/frappe/utils/data.py @@ -505,7 +505,17 @@ def has_common(l1, l2): """Returns truthy value if there are common elements in lists l1 and l2""" return set(l1) & set(l2) -def cast_fieldtype(fieldtype, value): +def cast_fieldtype(fieldtype, value=None): + """Cast the value to the Python native object of the Frappe fieldtype provided. + If value is None, the first/lowest value of the `fieldtype` will be returned. + + Mapping of Python types => Frappe types: + * float => ("Currency", "Float", "Percent") + * int => ("Int", "Check") + * datetime.datetime => ("Datetime",) + * datetime.date => ("Date",) + * datetime.time => ("Time",) + """ if fieldtype in ("Currency", "Float", "Percent"): value = flt(value) @@ -517,12 +527,18 @@ def cast_fieldtype(fieldtype, value): value = cstr(value) elif fieldtype == "Date": + if value is None: + value = datetime.datetime(1, 1, 1).date() value = getdate(value) elif fieldtype == "Datetime": + if value is None: + value = datetime.datetime(1, 1, 1) value = get_datetime(value) elif fieldtype == "Time": + if value is None: + value = "0:0:0" value = to_timedelta(value) return value From 70f9f77df8caae76b80790954451407413336c64 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 20 Aug 2021 12:16:55 +0530 Subject: [PATCH 207/306] fix: Handle exception --- frappe/public/js/frappe/form/layout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/layout.js b/frappe/public/js/frappe/form/layout.js index 21d7a451ac..8d52c8d592 100644 --- a/frappe/public/js/frappe/form/layout.js +++ b/frappe/public/js/frappe/form/layout.js @@ -260,7 +260,7 @@ frappe.ui.form.Layout = class Layout { is_numeric_field_active() { const control = $(document.activeElement).closest(".frappe-control"); - const fieldtype = control.data().fieldtype; + const fieldtype = (control.data() || {}).fieldtype; return frappe.model.numeric_fieldtypes.includes(fieldtype); } From a2cb9be7a4cd89e563888006e91ba03f353c251c Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 20 Aug 2021 12:35:24 +0530 Subject: [PATCH 208/306] feat: frappe.utils.data.cast Cast the value to the Python native object of the Frappe fieldtype provided. If value is None, the first/lowest value of the `fieldtype` will be returned. Mapping of Python types => Frappe types: * float => ("Currency", "Float", "Percent") * int => ("Int", "Check") * datetime.datetime => ("Datetime",) * datetime.date => ("Date",) * datetime.time => ("Time",) Deprecate frappe.utils.data.cast_fieldtype in favour of new util cast which handles types "better" --- frappe/utils/data.py | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/frappe/utils/data.py b/frappe/utils/data.py index d89cda1519..4a25ad997a 100644 --- a/frappe/utils/data.py +++ b/frappe/utils/data.py @@ -8,6 +8,7 @@ import re, datetime, math, time from code import compile_command from urllib.parse import quote, urljoin from frappe.desk.utils import slug +from click import secho DATE_FORMAT = "%Y-%m-%d" TIME_FORMAT = "%H:%M:%S.%f" @@ -505,7 +506,36 @@ def has_common(l1, l2): """Returns truthy value if there are common elements in lists l1 and l2""" return set(l1) & set(l2) -def cast_fieldtype(fieldtype, value=None): +def cast_fieldtype(fieldtype, value): + # TODO: Add DeprecationWarning for this util + message = ( + "Function `frappe.utils.data.cast` has been deprecated in favour" + " of `frappe.utils.data.cast`. Use the newer util for safer type casting. " + ) + secho(message, fg="yellow") + + if fieldtype in ("Currency", "Float", "Percent"): + value = flt(value) + + elif fieldtype in ("Int", "Check"): + value = cint(value) + + elif fieldtype in ("Data", "Text", "Small Text", "Long Text", + "Text Editor", "Select", "Link", "Dynamic Link"): + value = cstr(value) + + elif fieldtype == "Date": + value = getdate(value) + + elif fieldtype == "Datetime": + value = get_datetime(value) + + elif fieldtype == "Time": + value = to_timedelta(value) + + return value + +def cast(fieldtype, value=None): """Cast the value to the Python native object of the Frappe fieldtype provided. If value is None, the first/lowest value of the `fieldtype` will be returned. @@ -1218,7 +1248,7 @@ def evaluate_filters(doc, filters): def compare(val1, condition, val2, fieldtype=None): ret = False if fieldtype: - val2 = cast_fieldtype(fieldtype, val2) + val2 = cast(fieldtype, val2) if condition in operator_map: ret = operator_map[condition](val1, val2) From ed6533f73705a483853d5b5ae8bf8cc0fca9156a Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 20 Aug 2021 12:37:15 +0530 Subject: [PATCH 209/306] fix: Use cast in favour of cast_fieldtype Use newly introduced casting util for Python-Frappe types mapping --- frappe/database/database.py | 21 ++------------------- frappe/model/base_document.py | 4 ++-- frappe/model/meta.py | 12 ++++++------ 3 files changed, 10 insertions(+), 27 deletions(-) diff --git a/frappe/database/database.py b/frappe/database/database.py index d6ecf0795d..9fab8e116f 100644 --- a/frappe/database/database.py +++ b/frappe/database/database.py @@ -14,7 +14,7 @@ import frappe.model.meta from frappe import _ from time import time -from frappe.utils import now, getdate, cast_fieldtype, get_datetime, get_table_name +from frappe.utils import now, getdate, cast, get_datetime, get_table_name from frappe.model.utils.link_count import flush_local_link_count @@ -516,7 +516,6 @@ class Database(object): FROM `tabSingles` WHERE doctype = %s """, doctype) - # result = _cast_result(doctype, result) dict_ = frappe._dict(result) @@ -557,7 +556,7 @@ class Database(object): if not df: frappe.throw(_('Invalid field name: {0}').format(frappe.bold(fieldname)), self.InvalidColumnName) - val = cast_fieldtype(df.fieldtype, val) + val = cast(df.fieldtype, val) self.value_cache[doctype][fieldname] = val @@ -1052,19 +1051,3 @@ def enqueue_jobs_after_commit(): q.enqueue_call(execute_job, timeout=job.get("timeout"), kwargs=job.get("queue_args")) frappe.flags.enqueue_after_commit = [] - -# Helpers -def _cast_result(doctype, result): - batch = [ ] - - try: - for field, value in result: - df = frappe.get_meta(doctype).get_field(field) - if df: - value = cast_fieldtype(df.fieldtype, value) - - batch.append(tuple([field, value])) - except frappe.exceptions.DoesNotExistError: - return result - - return tuple(batch) diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py index 752543f46a..815dd27002 100644 --- a/frappe/model/base_document.py +++ b/frappe/model/base_document.py @@ -9,7 +9,7 @@ from frappe.model.utils.link_count import notify_link_count from frappe.modules import load_doctype_module from frappe.model import display_fieldtypes from frappe.utils import (cint, flt, now, cstr, strip_html, - sanitize_html, sanitize_email, cast_fieldtype) + sanitize_html, sanitize_email, cast) from frappe.utils.html_utils import unescape_html max_positive_value = { @@ -969,7 +969,7 @@ class BaseDocument(object): return self.cast(val, df) def cast(self, value, df): - return cast_fieldtype(df.fieldtype, value) + return cast(df.fieldtype, value) def _extract_images_from_text_editor(self): from frappe.core.doctype.file.file import extract_images_from_doc diff --git a/frappe/model/meta.py b/frappe/model/meta.py index de794ba77f..f89163e092 100644 --- a/frappe/model/meta.py +++ b/frappe/model/meta.py @@ -16,7 +16,7 @@ Example: ''' from datetime import datetime import frappe, json, os -from frappe.utils import cstr, cint, cast_fieldtype +from frappe.utils import cstr, cint, cast from frappe.model import default_fields, no_value_fields, optional_fields, data_fieldtypes, table_fields from frappe.model.document import Document from frappe.model.base_document import BaseDocument @@ -322,24 +322,24 @@ class Meta(Document): for ps in property_setters: if ps.doctype_or_field=='DocType': - self.set(ps.property, cast_fieldtype(ps.property_type, ps.value)) + self.set(ps.property, cast(ps.property_type, ps.value)) elif ps.doctype_or_field=='DocField': for d in self.fields: if d.fieldname == ps.field_name: - d.set(ps.property, cast_fieldtype(ps.property_type, ps.value)) + d.set(ps.property, cast(ps.property_type, ps.value)) break elif ps.doctype_or_field=='DocType Link': for d in self.links: if d.name == ps.row_name: - d.set(ps.property, cast_fieldtype(ps.property_type, ps.value)) + d.set(ps.property, cast(ps.property_type, ps.value)) break elif ps.doctype_or_field=='DocType Action': for d in self.actions: if d.name == ps.row_name: - d.set(ps.property, cast_fieldtype(ps.property_type, ps.value)) + d.set(ps.property, cast(ps.property_type, ps.value)) break def add_custom_links_and_actions(self): @@ -532,7 +532,7 @@ class Meta(Document): label = link.group, items = [link.parent_doctype or link.link_doctype] )) - + if not link.is_child_table: if link.link_fieldname != data.fieldname: if data.fieldname: From de3050cd81478de35a9c78e660195480f95c7523 Mon Sep 17 00:00:00 2001 From: Komal-Saraf0609 Date: Fri, 20 Aug 2021 12:47:51 +0530 Subject: [PATCH 210/306] test: Corrected selectors and shorten them (Using the added testing-library) --- cypress/integration/dashboard_links.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cypress/integration/dashboard_links.js b/cypress/integration/dashboard_links.js index 6bf2d22dad..e6c9a7e08c 100644 --- a/cypress/integration/dashboard_links.js +++ b/cypress/integration/dashboard_links.js @@ -13,8 +13,8 @@ context('Dashboard links', () => { //Adding a new contact cy.get('.btn[data-doctype="Contact"]').click(); - cy.get('.has-error > .form-group > .control-input-wrapper > .control-input > .input-with-feedback').type('Admin'); - cy.get('#page-Contact > .page-head > .container > .row > .col > .standard-actions > .primary-action').click(); + cy.get('[data-doctype="Contact"][data-fieldname="first_name"]').type('Admin'); + cy.findByRole('button', {name: 'Save'}).click(); cy.visit('/app/user'); cy.get('.list-row-col > .level-item > .ellipsis').eq(0).click(); @@ -25,15 +25,15 @@ context('Dashboard links', () => { //Deleting the newly created contact cy.visit('/app/contact'); cy.get('.list-subject > .select-like > .list-row-checkbox').eq(0).click(); - cy.get('.actions-btn-group > .btn').contains('Actions').click(); - cy.get('.actions-btn-group > .dropdown-menu > li > .grey-link').eq(5).click(); - cy.get('.modal-footer > .standard-actions > .btn-primary').contains('Yes').click({delay: 700}); + cy.findByRole('button', {name: 'Actions'}).click(); + cy.get('.actions-btn-group [data-label="Delete"]').click(); + cy.findByRole('button', {name: 'Yes'}).click({delay: 700}); //To check if the counter from the "Contact" doc link is removed - cy.visit('/app/user'); cy.wait(700); + cy.visit('/app/user'); cy.get('.list-row-col > .level-item > .ellipsis').eq(0).click(); cy.get('[data-doctype="Contact"]').should('contain', 'Contact'); }); -}); \ No newline at end of file +}); From 9781fb758f2223294dd818680cc85c0ee03b6cf7 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 20 Aug 2021 22:06:50 +0530 Subject: [PATCH 211/306] fix: Rate limiter to allow kwargs --- frappe/rate_limiter.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/rate_limiter.py b/frappe/rate_limiter.py index 023cdb9cb0..528e5d6b56 100644 --- a/frappe/rate_limiter.py +++ b/frappe/rate_limiter.py @@ -103,7 +103,7 @@ def rate_limit(key: str, limit: Union[int, Callable] = 5, seconds: int= 24*60*60 def wrapper(*args, **kwargs): # Do not apply rate limits if method is not opted to check if methods != 'ALL' and frappe.request.method.upper() not in methods: - return frappe.call(fun, **frappe.form_dict) + return frappe.call(fun, **frappe.form_dict or kwargs) _limit = limit() if callable(limit) else limit @@ -118,6 +118,6 @@ def rate_limit(key: str, limit: Union[int, Callable] = 5, seconds: int= 24*60*60 if value > _limit: frappe.throw(_("You hit the rate limit because of too many requests. Please try after sometime.")) - return frappe.call(fun, **frappe.form_dict) + return frappe.call(fun, **frappe.form_dict or kwargs) return wrapper return ratelimit_decorator From 6f72e79f1acce546c8ada707afa57c2353bf2b4b Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 20 Aug 2021 22:35:01 +0530 Subject: [PATCH 212/306] test: Add more assertions for reset password --- frappe/core/doctype/user/test_user.py | 27 ++++++++++++++++++- .../notification_log/test_notification_log.py | 6 ++--- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/frappe/core/doctype/user/test_user.py b/frappe/core/doctype/user/test_user.py index 5fea8ed9d8..1c4c483fa8 100644 --- a/frappe/core/doctype/user/test_user.py +++ b/frappe/core/doctype/user/test_user.py @@ -1,11 +1,12 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # MIT License. See license.txt import frappe, unittest +import json from frappe.model.delete_doc import delete_doc from frappe.utils import get_url from frappe.core.doctype.user.user import (test_password_strength, - extract_mentions, sign_up, update_password, verify_password) + extract_mentions, sign_up, update_password, verify_password, reset_password) from frappe.frappeclient import FrappeClient from unittest.mock import patch @@ -347,6 +348,30 @@ class TestUser(unittest.TestCase): # reset password update_password(old_password, old_password=new_password) + # test API endpoint + with patch.object(user_module.frappe, 'sendmail') as sendmail: + frappe.clear_messages() + test_user = frappe.get_doc("User", "test2@example.com") + self.assertEqual(reset_password(user="test2@example.com"), None) + test_user.reload() + self.assertEqual(update_password(new_password, key=test_user.reset_password_key), "/") + update_password(old_password, old_password=new_password) + self.assertEqual(json.loads(frappe.message_log[0]), {"message": "Password reset instructions have been sent to your email"}) + sendmail.assert_called_once() + self.assertEqual(sendmail.call_args[1]["recipients"], "test2@example.com") + + self.assertEqual(reset_password(user="test2@example.com"), None) + self.assertEqual(reset_password(user="Administrator"), "not allowed") + self.assertEqual(reset_password(user="random"), "not found") + + def test_user_onload_modules(self): + from frappe.desk.form.load import getdoc + from frappe.config import get_modules_from_all_apps + frappe.response.docs = [] + getdoc("User", "Administrator") + doc = frappe.response.docs[0] + self.assertListEqual(doc.get("__onload").get('all_modules', []), + [m.get("module_name") for m in get_modules_from_all_apps()]) def test_password_verification(self): diff --git a/frappe/desk/doctype/notification_log/test_notification_log.py b/frappe/desk/doctype/notification_log/test_notification_log.py index 2d232cf942..bedb10b495 100644 --- a/frappe/desk/doctype/notification_log/test_notification_log.py +++ b/frappe/desk/doctype/notification_log/test_notification_log.py @@ -2,6 +2,7 @@ # Copyright (c) 2019, Frappe Technologies and Contributors # See license.txt import frappe +from frappe.core.doctype.user.user import get_system_users from frappe.desk.form.assign_to import add as assign_task import unittest @@ -54,7 +55,4 @@ def get_todo(): return frappe.get_cached_doc('ToDo', res[0].name) def get_user(): - users = frappe.db.get_all('User', - filters={'name': ('not in', ['Administrator', 'Guest']), 'enabled': 1}, - fields='name', limit=1) - return users[0].name + return get_system_users(limit=1)[0] From 9e4c8cc28ec93dc23be354ec2a8a33933c1a1719 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 20 Aug 2021 23:35:55 +0530 Subject: [PATCH 213/306] chore: Remove commented text --- frappe/core/doctype/file/test_file.py | 6 ------ frappe/core/doctype/user/test_user.py | 3 --- 2 files changed, 9 deletions(-) diff --git a/frappe/core/doctype/file/test_file.py b/frappe/core/doctype/file/test_file.py index f9d06429ff..5478d7ab85 100644 --- a/frappe/core/doctype/file/test_file.py +++ b/frappe/core/doctype/file/test_file.py @@ -569,9 +569,3 @@ class TestFileUtils(unittest.TestCase): from frappe.core.doctype.file.file import create_new_folder folder = create_new_folder('test_folder', 'Home') self.assertTrue(folder.is_folder) - -# def get_files_by_search_text(text): -# def optimize_saved_image(doc_name): -# def download_file(file_url): -# def remove_file_by_url(file_url, doctype=None, name=None): -# def on_doctype_update(): \ No newline at end of file diff --git a/frappe/core/doctype/user/test_user.py b/frappe/core/doctype/user/test_user.py index 1c4c483fa8..6ea744d553 100644 --- a/frappe/core/doctype/user/test_user.py +++ b/frappe/core/doctype/user/test_user.py @@ -374,9 +374,6 @@ class TestUser(unittest.TestCase): [m.get("module_name") for m in get_modules_from_all_apps()]) - def test_password_verification(self): - pass - def delete_contact(user): frappe.db.sql("DELETE FROM `tabContact` WHERE `email_id`= %s", user) frappe.db.sql("DELETE FROM `tabContact Email` WHERE `email_id`= %s", user) From 5587ab5a91ebb5c000c5ad9e9b249deffa7127ff Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 20 Aug 2021 23:54:42 +0530 Subject: [PATCH 214/306] style: Fix liinter warnings --- frappe/core/doctype/file/file.py | 2 +- .../prepared_report/prepared_report.py | 1 - frappe/core/doctype/user/test_user.py | 19 +++++++++---------- .../doctype/email_account/email_account.py | 13 +++++++------ 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index 06222872a6..fcc8a860f3 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -319,7 +319,7 @@ class File(Document): def unzip(self): '''Unzip current file and replace it by its children''' - if not ".zip" in self.file_url: + if not self.file_url.endswith(".zip"): frappe.throw(_("{0} is not a zip file").format(self.file_name)) zip_path = self.get_full_path() diff --git a/frappe/core/doctype/prepared_report/prepared_report.py b/frappe/core/doctype/prepared_report/prepared_report.py index 409aa6f217..c9b5fd9d2e 100644 --- a/frappe/core/doctype/prepared_report/prepared_report.py +++ b/frappe/core/doctype/prepared_report/prepared_report.py @@ -11,7 +11,6 @@ from frappe.desk.query_report import generate_report_result from frappe.model.document import Document from frappe.utils import gzip_compress, gzip_decompress from frappe.utils.background_jobs import enqueue -from frappe.utils.file_manager import remove_all class PreparedReport(Document): def before_insert(self): diff --git a/frappe/core/doctype/user/test_user.py b/frappe/core/doctype/user/test_user.py index 6ea744d553..bcc273a784 100644 --- a/frappe/core/doctype/user/test_user.py +++ b/frappe/core/doctype/user/test_user.py @@ -1,16 +1,16 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # MIT License. See license.txt -import frappe, unittest import json +import unittest +from unittest.mock import patch +import frappe +import frappe.exceptions +from frappe.core.doctype.user.user import (extract_mentions, reset_password, + sign_up, test_password_strength, update_password, verify_password) +from frappe.frappeclient import FrappeClient from frappe.model.delete_doc import delete_doc from frappe.utils import get_url -from frappe.core.doctype.user.user import (test_password_strength, - extract_mentions, sign_up, update_password, verify_password, reset_password) -from frappe.frappeclient import FrappeClient - -from unittest.mock import patch -import frappe.exceptions user_module = frappe.core.doctype.user.user test_records = frappe.get_test_records('User') @@ -305,9 +305,8 @@ class TestUser(unittest.TestCase): def test_reset_password(self): + from frappe.auth import CookieManager, LoginManager from frappe.utils import set_request - from frappe.auth import CookieManager - from frappe.auth import LoginManager old_password = "Eastern_43A1W" new_password = "easy_password" @@ -365,8 +364,8 @@ class TestUser(unittest.TestCase): self.assertEqual(reset_password(user="random"), "not found") def test_user_onload_modules(self): - from frappe.desk.form.load import getdoc from frappe.config import get_modules_from_all_apps + from frappe.desk.form.load import getdoc frappe.response.docs = [] getdoc("User", "Administrator") doc = frappe.response.docs[0] diff --git a/frappe/email/doctype/email_account/email_account.py b/frappe/email/doctype/email_account/email_account.py index a1ddbf7a68..fb7349adba 100755 --- a/frappe/email/doctype/email_account/email_account.py +++ b/frappe/email/doctype/email_account/email_account.py @@ -725,6 +725,7 @@ def get_max_email_uid(email_account): def setup_user_email_inbox(email_account, awaiting_password, email_id, enable_outgoing): """ setup email inbox for user """ from frappe.core.doctype.user.user import ask_pass_update + def add_user_email(user): user = frappe.get_doc("User", user) row = user.append("user_emails", {}) @@ -736,11 +737,11 @@ def setup_user_email_inbox(email_account, awaiting_password, email_id, enable_ou user.save(ignore_permissions=True) - udpate_user_email_settings = False + update_user_email_settings = False if not all([email_account, email_id]): return - user_names = frappe.db.get_values("User", { "email": email_id }, as_dict=True) + user_names = frappe.db.get_values("User", {"email": email_id}, as_dict=True) if not user_names: return @@ -757,9 +758,9 @@ def setup_user_email_inbox(email_account, awaiting_password, email_id, enable_ou add_user_email(user_name) else: # update awaiting password for email account - udpate_user_email_settings = True + update_user_email_settings = True - if udpate_user_email_settings: + if update_user_email_settings: frappe.db.sql("""UPDATE `tabUser Email` SET awaiting_password = %(awaiting_password)s, enable_outgoing = %(enable_outgoing)s WHERE email_account = %(email_account)s""", { "email_account": email_account, @@ -782,8 +783,8 @@ def remove_user_email_inbox(email_account): for user in users: doc = frappe.get_doc("User", user.get("name")) - to_remove = [ row for row in doc.user_emails if row.email_account == email_account ] - [ doc.remove(row) for row in to_remove ] + to_remove = [row for row in doc.user_emails if row.email_account == email_account] + [doc.remove(row) for row in to_remove] doc.save(ignore_permissions=True) From 399629da45ab664df8ae3c6c21e806962cc0a7d0 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Sat, 21 Aug 2021 13:47:42 +0530 Subject: [PATCH 215/306] fix(ux): Disable button while executing script - page.set_action will now pass the btn in the handler callback --- frappe/desk/doctype/system_console/system_console.js | 9 ++++++--- frappe/public/js/frappe/form/form.js | 4 ++-- frappe/public/js/frappe/ui/page.js | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/frappe/desk/doctype/system_console/system_console.js b/frappe/desk/doctype/system_console/system_console.js index c7eac39490..48dd2ba108 100644 --- a/frappe/desk/doctype/system_console/system_console.js +++ b/frappe/desk/doctype/system_console/system_console.js @@ -5,7 +5,7 @@ frappe.ui.form.on('System Console', { onload: function(frm) { frappe.ui.keys.add_shortcut({ shortcut: 'shift+enter', - action: () => frm.execute_action('Execute'), + action: () => frm.page.btn_primary.trigger('click'), page: frm.page, description: __('Execute Console script'), ignore_inputs: true, @@ -14,8 +14,11 @@ frappe.ui.form.on('System Console', { refresh: function(frm) { frm.disable_save(); - frm.page.set_primary_action(__("Execute"), () => { - frm.execute_action('Execute'); + frm.page.set_primary_action(__("Execute"), $btn => { + $btn.text(__('Executing...')); + return frm.execute_action("Execute").then(() => { + $btn.text(__('Execute')); + }); }); } }); diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index fd49df027c..3588923527 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -339,7 +339,7 @@ frappe.ui.form.Form = class FrappeForm { } } if (action.action_type==='Server Action') { - frappe.xcall(action.action, {'doc': this.doc}).then((doc) => { + return frappe.xcall(action.action, {'doc': this.doc}).then((doc) => { if (doc.doctype) { // document is returned by the method, // apply the changes locally and refresh @@ -354,7 +354,7 @@ frappe.ui.form.Form = class FrappeForm { }); }); } else if (action.action_type==='Route') { - frappe.set_route(action.action); + return frappe.set_route(action.action); } } diff --git a/frappe/public/js/frappe/ui/page.js b/frappe/public/js/frappe/ui/page.js index 22fdf476b8..320227b258 100644 --- a/frappe/public/js/frappe/ui/page.js +++ b/frappe/public/js/frappe/ui/page.js @@ -251,7 +251,7 @@ frappe.ui.Page = class Page { .prop("disabled", false) .html(opts.label) .on("click", function() { - let response = opts.click.apply(this); + let response = opts.click.apply(this, [btn]); me.btn_disable_enable(btn, response); }); From cd9b07b3bbdb80c27370301f9f786c537a9ff646 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Sat, 21 Aug 2021 19:07:44 +0530 Subject: [PATCH 216/306] test: Add test case for docfield length property update --- .../doctype/customize_form/test_customize_form.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/frappe/custom/doctype/customize_form/test_customize_form.py b/frappe/custom/doctype/customize_form/test_customize_form.py index aef95cd676..6783e52d68 100644 --- a/frappe/custom/doctype/customize_form/test_customize_form.py +++ b/frappe/custom/doctype/customize_form/test_customize_form.py @@ -188,6 +188,19 @@ class TestCustomizeForm(unittest.TestCase): def test_core_doctype_customization(self): self.assertRaises(frappe.ValidationError, self.get_customize_form, 'User') + def test_save_customization_length_field_property(self): + # Using Notification Log doctype as it doesn't have any other custom fields + d = self.get_customize_form("Notification Log") + + document_name = d.get("fields", {"fieldname": "document_name"})[0] + document_name.length = 255 + d.run_method("save_customization") + + self.assertEqual(frappe.db.get_value("Property Setter", + {"doc_type": "Notification Log", "property": "length", "field_name": "document_name"}, "value"), '255') + + self.assertTrue(d.flags.update_db) + def test_custom_link(self): try: # create a dummy doctype linked to Event From cc5a23411b6eefdd303f76d79554e93391c531f1 Mon Sep 17 00:00:00 2001 From: MitulDavid Date: Mon, 23 Aug 2021 11:15:02 +0530 Subject: [PATCH 217/306] refactor: Image cropping and optimization --- frappe/core/doctype/file/file.py | 41 ++++++++++++------- frappe/public/icons/timeless/symbol-defs.svg | 2 +- .../public/js/frappe/file_uploader/index.js | 4 +- frappe/utils/file_manager.py | 2 +- 4 files changed, 32 insertions(+), 17 deletions(-) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index e79b2bd761..f279a04a44 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -594,6 +594,31 @@ class File(Document): if self.file_url: self.is_private = cint(self.file_url.startswith('/private')) + @frappe.whitelist() + def optimize_file(self): + if self.is_folder: + raise TypeError('Folders cannot be optimized') + + content_type = mimetypes.guess_type(self.file_name)[0] + is_local_image = content_type.startswith('image/') and self.file_size > 0 + is_svg = content_type == 'image/svg+xml' + if is_local_image and not is_svg: + content = self.get_content() + optimized_content = optimize_image(content, content_type) + + file_path = get_files_path(is_private=self.is_private) + file_path = os.path.join(file_path.encode('utf-8'), self.file_name.encode('utf-8')) + with open(file_path, 'wb+') as f: + f.write(optimized_content) + + self.file_size = len(optimized_content) + self.content_hash = get_content_hash(optimized_content) + self.save() + elif is_svg: + raise TypeError('Optimization of SVG images is not supported') + else: + raise NotImplementedError('Only local image files can be optimized') + def on_doctype_update(): frappe.db.add_index("File", ["attached_to_doctype", "attached_to_name"]) @@ -886,7 +911,7 @@ def extract_images_from_html(doc, content): if b"," in content: content = content.split(b",")[1] content = base64.b64decode(content) - + content = optimize_image(content, mtype) if "filename=" in headers: @@ -943,19 +968,7 @@ def unzip_file(name): @frappe.whitelist() def optimize_saved_image(doc_name): file_doc = frappe.get_doc('File', doc_name) - content = file_doc.get_content() - content_type = mimetypes.guess_type(file_doc.file_name)[0] - - optimized_content = optimize_image(content, content_type) - - file_path = get_files_path(is_private=file_doc.is_private) - file_path = os.path.join(file_path.encode('utf-8'), file_doc.file_name.encode('utf-8')) - with open(file_path, 'wb+') as f: - f.write(optimized_content) - - file_doc.file_size = len(optimized_content) - file_doc.content_hash = get_content_hash(optimized_content) - file_doc.save() + file_doc.optimize_file() @frappe.whitelist() def get_attached_images(doctype, names): diff --git a/frappe/public/icons/timeless/symbol-defs.svg b/frappe/public/icons/timeless/symbol-defs.svg index f216374526..b2f1428967 100644 --- a/frappe/public/icons/timeless/symbol-defs.svg +++ b/frappe/public/icons/timeless/symbol-defs.svg @@ -567,7 +567,7 @@ - diff --git a/frappe/public/js/frappe/file_uploader/index.js b/frappe/public/js/frappe/file_uploader/index.js index daad9857ee..87bc1c8ec8 100644 --- a/frappe/public/js/frappe/file_uploader/index.js +++ b/frappe/public/js/frappe/file_uploader/index.js @@ -28,7 +28,7 @@ export default class FileUploader { } if (attach_doc_image) { - restrictions.allowed_file_types = ['.jpg', '.jpeg', '.png']; + restrictions.allowed_file_types = ['image/jpeg', 'image/png']; } this.$fileuploader = new Vue({ @@ -70,8 +70,10 @@ export default class FileUploader { this.uploader.$watch('hide_dialog_footer', (hide_dialog_footer) => { if (hide_dialog_footer) { this.dialog && this.dialog.footer.addClass('hide'); + this.dialog.$wrapper.data('bs.modal')._config.backdrop = 'static'; } else { this.dialog && this.dialog.footer.removeClass('hide'); + this.dialog.$wrapper.data('bs.modal')._config.backdrop = true; } }); diff --git a/frappe/utils/file_manager.py b/frappe/utils/file_manager.py index 7efdff299b..79a5423d8b 100644 --- a/frappe/utils/file_manager.py +++ b/frappe/utils/file_manager.py @@ -393,7 +393,7 @@ def extract_images_from_html(doc, content): if b"," in content: content = content.split(b",")[1] content = base64.b64decode(content) - + content = optimize_image(content, mtype) if "filename=" in headers: From d01335ab91376dc3751a32568440340d688410df Mon Sep 17 00:00:00 2001 From: shariquerik Date: Mon, 23 Aug 2021 11:26:43 +0530 Subject: [PATCH 218/306] fix: Faulty Export All rows visibility condition --- frappe/public/js/frappe/list/list_view.js | 3 ++- frappe/public/js/frappe/views/reports/report_view.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js index 8a0e43c8f3..d4133049e6 100644 --- a/frappe/public/js/frappe/list/list_view.js +++ b/frappe/public/js/frappe/list/list_view.js @@ -867,8 +867,9 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { filters: this.get_filters_for_args() }).then(total_count => { this.total_count = total_count || current_count; + this.count_without_children = count_without_children !== current_count ? count_without_children : undefined; let str = __('{0} of {1}', [current_count, this.total_count]); - if (count_without_children !== current_count) { + if (this.count_without_children) { str = __('{0} of {1} ({2} rows with children)', [count_without_children, this.total_count, current_count]); } return str; diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js index 2547dd6407..b46e6fb374 100644 --- a/frappe/public/js/frappe/views/reports/report_view.js +++ b/frappe/public/js/frappe/views/reports/report_view.js @@ -1401,7 +1401,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { } ]; - if (this.total_count > args.page_length) { + if (this.total_count > this.count_without_children || args.page_length) { fields.push({ fieldtype: 'Check', fieldname: 'export_all_rows', From 7c178ae18c41d21ac53d8b77aae0b179adeb8349 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 23 Aug 2021 11:28:33 +0530 Subject: [PATCH 219/306] fix(ux): better message for removal of assignment (#14008) (cherry picked from commit 40352d9df6418e0c435e0ae9f9dd8f96095c70db) Co-authored-by: Ankush Menat --- frappe/desk/doctype/todo/todo.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/frappe/desk/doctype/todo/todo.py b/frappe/desk/doctype/todo/todo.py index 09297b4e5e..754b94cdcb 100644 --- a/frappe/desk/doctype/todo/todo.py +++ b/frappe/desk/doctype/todo/todo.py @@ -29,8 +29,15 @@ class ToDo(Document): else: # NOTE the previous value is only available in validate method if self.get_db_value("status") != self.status: + if self.owner == frappe.session.user: + removal_message = frappe._("{0} removed their assignment.").format( + get_fullname(frappe.session.user)) + else: + removal_message = frappe._("Assignment of {0} removed by {1}").format( + get_fullname(self.owner), get_fullname(frappe.session.user)) + self._assignment = { - "text": frappe._("Assignment closed by {0}").format(get_fullname(frappe.session.user)), + "text": removal_message, "comment_type": "Assignment Completed" } From 30f9572122a4ef8c357799e50f763e49c21cac4c Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Mon, 23 Aug 2021 12:32:14 +0530 Subject: [PATCH 220/306] chore: Let maintainer raise a PR on stable branch --- .mergify.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 1a81a28594..8c7a7dc95d 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,9 +1,11 @@ pull_request_rules: - name: Auto-close PRs on stable branch conditions: - - or: - - base=version-13 - - base=version-12 + - and: + - author!=surajshetty3416 + - or: + - base=version-13 + - base=version-12 actions: close: comment: From 7e9b78bf7deb5dd03c01653e81ef810e7f2dd7bc Mon Sep 17 00:00:00 2001 From: shariquerik Date: Mon, 23 Aug 2021 13:45:14 +0530 Subject: [PATCH 221/306] test: Type on focused block fix --- cypress/integration/workspace.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cypress/integration/workspace.js b/cypress/integration/workspace.js index 9701e54c5e..28930b5734 100644 --- a/cypress/integration/workspace.js +++ b/cypress/integration/workspace.js @@ -36,12 +36,12 @@ context('Workspace 2.0', () => { cy.get('.codex-editor__redactor .ce-block'); cy.get('.custom-actions .inner-group-button[data-label="Add%20Block"]').click(); cy.get('.custom-actions .inner-group-button .dropdown-menu .block-menu-item-label').contains('Heading').click(); - cy.get(".ce-block:last").find('h2').click({force: true}).type('Header'); + cy.get(":focus").type('Header'); cy.get(".ce-block:last").find('.ce-header').should('exist'); cy.get('.custom-actions .inner-group-button[data-label="Add%20Block"]').click(); cy.get('.custom-actions .inner-group-button .dropdown-menu .block-menu-item-label').contains('Text').click(); - cy.get(".ce-block:last").find('.ce-paragraph').click({force: true}).type('Paragraph text'); + cy.get(":focus").type('Paragraph text'); cy.get(".ce-block:last").find('.ce-paragraph').should('exist'); }); From 70899a7a959be3d7ba26bd6aa6783a7123434c24 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 23 Aug 2021 21:43:29 +0530 Subject: [PATCH 222/306] feat(minor): Added app_name and app_logo in Website Settings --- .../website_settings/website_settings.json | 23 +++++++++++++++---- frappe/www/login.py | 8 ++++--- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/frappe/website/doctype/website_settings/website_settings.json b/frappe/website/doctype/website_settings/website_settings.json index f4eee7231e..e7ae2a01e1 100644 --- a/frappe/website/doctype/website_settings/website_settings.json +++ b/frappe/website/doctype/website_settings/website_settings.json @@ -56,9 +56,11 @@ "google_analytics_id", "google_analytics_anonymize_ip", "misc_section", - "subdomain", + "app_name", + "app_logo", "disable_signup", "section_break_38", + "subdomain", "head_html", "robots_txt", "route_redirects", @@ -224,7 +226,7 @@ "collapsible": 1, "fieldname": "misc_section", "fieldtype": "Section Break", - "label": "Disable Signup" + "label": "Login Page" }, { "description": "An icon file with .ico extension. Should be 16 x 16 px. Generated using a favicon generator. [favicon-generator.org]", @@ -235,7 +237,7 @@ { "description": "Sub-domain provided by erpnext.com", "fieldname": "subdomain", - "fieldtype": "Text", + "fieldtype": "Small Text", "label": "Subdomain", "read_only": 1 }, @@ -425,6 +427,17 @@ "fieldname": "navbar_template_section", "fieldtype": "Section Break", "label": "Navbar Template" + }, + { + "default": "Frappe", + "fieldname": "app_name", + "fieldtype": "Data", + "label": "App Name" + }, + { + "fieldname": "app_logo", + "fieldtype": "Attach Image", + "label": "App Logo" } ], "icon": "fa fa-cog", @@ -433,7 +446,7 @@ "issingle": 1, "links": [], "max_attachments": 10, - "modified": "2021-07-15 17:39:56.609771", + "modified": "2021-08-23 21:39:51.702248", "modified_by": "Administrator", "module": "Website", "name": "Website Settings", @@ -457,4 +470,4 @@ "sort_field": "modified", "sort_order": "ASC", "track_changes": 1 -} +} \ No newline at end of file diff --git a/frappe/www/login.py b/frappe/www/login.py index 6542b29d42..f816b2f91e 100644 --- a/frappe/www/login.py +++ b/frappe/www/login.py @@ -34,9 +34,11 @@ def get_context(context): context.for_test = 'login.html' context["title"] = "Login" context["provider_logins"] = [] - context["disable_signup"] = frappe.utils.cint(frappe.db.get_value("Website Settings", "Website Settings", "disable_signup")) - context["logo"] = frappe.get_hooks("app_logo_url")[-1] - context["app_name"] = frappe.get_system_settings("app_name") or _("Frappe") + context["disable_signup"] = frappe.utils.cint(frappe.db.get_single_value("Website Settings", "disable_signup")) + context["logo"] = (frappe.db.get_single_value('Website Settings', 'app_logo') or + frappe.get_hooks("app_logo_url")[-1]) + context["app_name"] = (frappe.db.get_single_value('Website Settings', 'app_name') or + frappe.get_system_settings("app_name") or _("Frappe")) providers = [i.name for i in frappe.get_all("Social Login Key", filters={"enable_social_login":1}, order_by="name")] for provider in providers: client_id, base_url = frappe.get_value("Social Login Key", provider, ["client_id", "base_url"]) From 7caae74004b30cfcd6718c1a3b3f1d151efe9e1b Mon Sep 17 00:00:00 2001 From: Shariq Ansari <30859809+shariquerik@users.noreply.github.com> Date: Tue, 24 Aug 2021 10:15:37 +0530 Subject: [PATCH 223/306] build: Update datatable to 1.15.4 (#14016) Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 1ddbec178e..2283a44533 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "express": "^4.17.1", "fast-deep-equal": "^2.0.1", "frappe-charts": "^2.0.0-rc13", - "frappe-datatable": "^1.15.3", + "frappe-datatable": "^1.15.4", "frappe-gantt": "^0.5.0", "fuse.js": "^3.4.6", "highlight.js": "^10.4.1", diff --git a/yarn.lock b/yarn.lock index e8f527b7f1..ee530d747b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2721,10 +2721,10 @@ frappe-charts@^2.0.0-rc13: resolved "https://registry.yarnpkg.com/frappe-charts/-/frappe-charts-2.0.0-rc13.tgz#fdb251d7ae311c41e38f90a3ae108070ec6b9072" integrity sha512-Bv7IfllIrjRbKWHn5b769dOSenqdBixAr6m5kurf8ZUOJSLOgK4HOXItJ7BA8n9PvviH9/k5DaloisjLM2Bm1w== -frappe-datatable@^1.15.3: - version "1.15.3" - resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.15.3.tgz#1737e9aebfd363ffadffced71a3534c40e350223" - integrity sha512-tUE3pNbxCMX0HPKvwurLBPRAOAdS0gNo1+MpoyFSqXI7b7sp6/TCBRht6qu1Luw+VyIzBtXkJdnnqU+Uoy8iow== +frappe-datatable@^1.15.4: + version "1.15.4" + resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.15.4.tgz#dc2e5e5d8a0a7cb8ee658f2d39966af1d4405401" + integrity sha512-eW3upPvverm1GNBL4+IcPDvjm5xbJc5ZXW8TYEUZt/QQ2W75K/T6736pSzi9D6mX9sn3BtZ7Ige7MS45SGrgzQ== dependencies: hyperlist "^1.0.0-beta" lodash "^4.17.5" From 14783a1ba19ed381c132c0cd9c13cce1cb4b5174 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 24 Aug 2021 10:25:33 +0530 Subject: [PATCH 224/306] fix: Remove unnecessary raise after throw --- frappe/core/doctype/file/file.py | 1 - 1 file changed, 1 deletion(-) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index fcc8a860f3..5b88418675 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -258,7 +258,6 @@ class File(Document): self.content_hash = get_content_hash(f.read()) except IOError: frappe.throw(_("File {0} does not exist").format(self.file_url)) - raise def on_trash(self): if self.is_home_folder or self.is_attachments_folder: From 850939ed1374b9d145a2258b1be3155c955006bb Mon Sep 17 00:00:00 2001 From: gavin Date: Tue, 24 Aug 2021 13:26:03 +0530 Subject: [PATCH 225/306] Revert "ci: ignore js only changes while running unittests (#13932)" This reverts commit ead26527b7c0df4b4b011bd0962e751f15aa01b1. --- .github/workflows/patch-mariadb-tests.yml | 7 +------ .github/workflows/server-mariadb-tests.yml | 6 ------ .github/workflows/server-postgres-tests.yml | 3 --- .github/workflows/ui-tests.yml | 2 -- 4 files changed, 1 insertion(+), 17 deletions(-) diff --git a/.github/workflows/patch-mariadb-tests.yml b/.github/workflows/patch-mariadb-tests.yml index 82be4d06b5..e8627a01fb 100644 --- a/.github/workflows/patch-mariadb-tests.yml +++ b/.github/workflows/patch-mariadb-tests.yml @@ -1,11 +1,6 @@ name: Patch -on: - pull_request: - paths-ignore: - - '**.js' - - '**.md' - workflow_dispatch: +on: [pull_request, workflow_dispatch] jobs: test: diff --git a/.github/workflows/server-mariadb-tests.yml b/.github/workflows/server-mariadb-tests.yml index 8d5bd690a1..2476102e3d 100644 --- a/.github/workflows/server-mariadb-tests.yml +++ b/.github/workflows/server-mariadb-tests.yml @@ -2,15 +2,9 @@ name: Server on: pull_request: - paths-ignore: - - '**.js' - - '**.md' workflow_dispatch: push: branches: [ develop ] - paths-ignore: - - '**.js' - - '**.md' jobs: test: diff --git a/.github/workflows/server-postgres-tests.yml b/.github/workflows/server-postgres-tests.yml index 8c97c7f84b..4325eebaad 100644 --- a/.github/workflows/server-postgres-tests.yml +++ b/.github/workflows/server-postgres-tests.yml @@ -2,9 +2,6 @@ name: Server on: pull_request: - paths-ignore: - - '**.js' - - '**.md' workflow_dispatch: jobs: diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml index d76e5e77ea..f342c0709e 100644 --- a/.github/workflows/ui-tests.yml +++ b/.github/workflows/ui-tests.yml @@ -2,8 +2,6 @@ name: UI on: pull_request: - paths-ignore: - - '**.md' workflow_dispatch: push: branches: [ develop ] From af93d35471535522eeda9f72e95fd884b5a1ddfe Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 24 Aug 2021 14:33:53 +0530 Subject: [PATCH 226/306] fix: Use remove_all in file_manager.py --- frappe/core/doctype/file/file.py | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index 5b88418675..b8ea134db5 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -729,6 +729,7 @@ def remove_file_by_url(file_url, doctype=None, name=None): fid = frappe.db.get_value("File", {"file_url": file_url}) if fid: + from frappe.utils.file_manager import remove_file return remove_file(fid=fid) From 597d237f63fd0391cd55616ee47feb8a00fc18d2 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 24 Aug 2021 14:14:42 +0530 Subject: [PATCH 227/306] ci: Roulette for GHA --- .github/helper/install_dependencies.sh | 5 -- .github/helper/roulette.py | 77 ++++++++++----------- .github/workflows/patch-mariadb-tests.yml | 18 +++++ .github/workflows/server-mariadb-tests.yml | 22 ++++++ .github/workflows/server-postgres-tests.yml | 19 +++++ .github/workflows/ui-tests.yml | 21 ++++++ 6 files changed, 118 insertions(+), 44 deletions(-) diff --git a/.github/helper/install_dependencies.sh b/.github/helper/install_dependencies.sh index 9be8519d85..d16f5b62ad 100644 --- a/.github/helper/install_dependencies.sh +++ b/.github/helper/install_dependencies.sh @@ -2,11 +2,6 @@ set -e -# python "${GITHUB_WORKSPACE}/.github/helper/roulette.py" -# if [[ $? != 2 ]];then -# exit; -# fi - # install wkhtmltopdf wget -O /tmp/wkhtmltox.tar.xz https://github.com/frappe/wkhtmltopdf/raw/master/wkhtmltox-0.12.3_linux-generic-amd64.tar.xz tar -xf /tmp/wkhtmltox.tar.xz -C /tmp diff --git a/.github/helper/roulette.py b/.github/helper/roulette.py index ea4f07b9f7..ce4c8ed633 100644 --- a/.github/helper/roulette.py +++ b/.github/helper/roulette.py @@ -1,4 +1,3 @@ -# if the script ends with exit code 0, then no tests are run further, else all tests are run import os import re import shlex @@ -7,50 +6,50 @@ import sys def get_output(command, shell=True): - print(command) - command = shlex.split(command) - return subprocess.check_output(command, shell=shell, encoding="utf8").strip() + print(command) + command = shlex.split(command) + return subprocess.check_output(command, shell=shell, encoding="utf8").strip() def is_py(file): - return file.endswith("py") + return file.endswith("py") + +def is_ci(file): + return file.endswith("yml") or ".github" in file def is_js(file): - return file.endswith("js") + return file.endswith("js") def is_docs(file): - regex = re.compile(r'\.(md|png|jpg|jpeg)$|^.github|LICENSE') - return bool(regex.search(file)) + regex = re.compile(r'\.(md|png|jpg|jpeg)$|^.github|LICENSE') + return bool(regex.search(file)) if __name__ == "__main__": - build_type = os.environ.get("TYPE") - before = os.environ.get("BEFORE") - after = os.environ.get("AFTER") - commit_range = before + '...' + after - print("Build Type: {}".format(build_type)) - print("Commit Range: {}".format(commit_range)) - - try: - files_changed = get_output("git diff --name-only {}".format(commit_range), shell=False) - except Exception: - sys.exit(2) - - if "fatal" not in files_changed: - files_list = files_changed.split() - only_docs_changed = len(list(filter(is_docs, files_list))) == len(files_list) - only_js_changed = len(list(filter(is_js, files_list))) == len(files_list) - only_py_changed = len(list(filter(is_py, files_list))) == len(files_list) - - if only_docs_changed: - print("Only docs were updated, stopping build process.") - sys.exit(0) - - if only_js_changed and build_type == "server": - print("Only JavaScript code was updated; Stopping Python build process.") - sys.exit(0) - - if only_py_changed and build_type == "ui": - print("Only Python code was updated, stopping Cypress build process.") - sys.exit(0) - - sys.exit(2) + files_list = sys.argv[1:] + build_type = os.environ.get("TYPE") + + if not files_list: + print("No files' changes detected. Build is shutting") + sys.exit(0) + + ci_files_changed = any(f for f in files_list if is_ci(f)) + only_docs_changed = len(list(filter(is_docs, files_list))) == len(files_list) + only_js_changed = len(list(filter(is_js, files_list))) == len(files_list) + only_py_changed = len(list(filter(is_py, files_list))) == len(files_list) + + if ci_files_changed: + print("CI related files were updated, running all build processes.") + + if only_docs_changed: + print("Only docs were updated, stopping build process.") + sys.exit(0) + + if only_js_changed and build_type == "server": + print("Only JavaScript code was updated; Stopping Python build process.") + sys.exit(0) + + if only_py_changed and build_type == "ui": + print("Only Python code was updated, stopping Cypress build process.") + sys.exit(0) + + os.system('echo "::set-output name=build::strawberry"') diff --git a/.github/workflows/patch-mariadb-tests.yml b/.github/workflows/patch-mariadb-tests.yml index e8627a01fb..27776fb2f1 100644 --- a/.github/workflows/patch-mariadb-tests.yml +++ b/.github/workflows/patch-mariadb-tests.yml @@ -26,10 +26,22 @@ jobs: with: python-version: 3.7 + - uses: jitterbit/get-changed-files@v1 + id: files + + - name: Check if build should be run + id: check-build + run: | + python "${GITHUB_WORKSPACE}/.github/helper/roulette.py" ${{ steps.files.outputs.all }} + env: + TYPE: "server" + - name: Add to Hosts + if: ${{ steps.check-build.outputs.build == 'strawberry' }} run: echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts - name: Cache pip + if: ${{ steps.check-build.outputs.build == 'strawberry' }} uses: actions/cache@v2 with: path: ~/.cache/pip @@ -39,6 +51,7 @@ jobs: ${{ runner.os }}- - name: Cache node modules + if: ${{ steps.check-build.outputs.build == 'strawberry' }} uses: actions/cache@v2 env: cache-name: cache-node-modules @@ -51,10 +64,12 @@ jobs: ${{ runner.os }}- - name: Get yarn cache directory path + if: ${{ steps.check-build.outputs.build == 'strawberry' }} id: yarn-cache-dir-path run: echo "::set-output name=dir::$(yarn cache dir)" - uses: actions/cache@v2 + if: ${{ steps.check-build.outputs.build == 'strawberry' }} id: yarn-cache with: path: ${{ steps.yarn-cache-dir-path.outputs.dir }} @@ -63,6 +78,7 @@ jobs: ${{ runner.os }}-yarn- - name: Install Dependencies + if: ${{ steps.check-build.outputs.build == 'strawberry' }} run: bash ${GITHUB_WORKSPACE}/.github/helper/install_dependencies.sh env: BEFORE: ${{ env.GITHUB_EVENT_PATH.before }} @@ -70,12 +86,14 @@ jobs: TYPE: server - name: Install + if: ${{ steps.check-build.outputs.build == 'strawberry' }} run: bash ${GITHUB_WORKSPACE}/.github/helper/install.sh env: DB: mariadb TYPE: server - name: Run Patch Tests + if: ${{ steps.check-build.outputs.build == 'strawberry' }} run: | cd ~/frappe-bench/ wget https://frappeframework.com/files/v10-frappe.sql.gz diff --git a/.github/workflows/server-mariadb-tests.yml b/.github/workflows/server-mariadb-tests.yml index 2476102e3d..d6d5097a09 100644 --- a/.github/workflows/server-mariadb-tests.yml +++ b/.github/workflows/server-mariadb-tests.yml @@ -35,17 +35,30 @@ jobs: with: python-version: 3.7 + - uses: jitterbit/get-changed-files@v1 + id: files + + - name: Check if build should be run + id: check-build + run: | + python "${GITHUB_WORKSPACE}/.github/helper/roulette.py" ${{ steps.files.outputs.all }} + env: + TYPE: "server" + - uses: actions/setup-node@v2 + if: ${{ steps.check-build.outputs.build == 'strawberry' }} with: node-version: 14 check-latest: true - name: Add to Hosts + if: ${{ steps.check-build.outputs.build == 'strawberry' }} run: | echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts echo "127.0.0.1 test_site_producer" | sudo tee -a /etc/hosts - name: Cache pip + if: ${{ steps.check-build.outputs.build == 'strawberry' }} uses: actions/cache@v2 with: path: ~/.cache/pip @@ -55,6 +68,7 @@ jobs: ${{ runner.os }}- - name: Cache node modules + if: ${{ steps.check-build.outputs.build == 'strawberry' }} uses: actions/cache@v2 env: cache-name: cache-node-modules @@ -67,10 +81,12 @@ jobs: ${{ runner.os }}- - name: Get yarn cache directory path + if: ${{ steps.check-build.outputs.build == 'strawberry' }} id: yarn-cache-dir-path run: echo "::set-output name=dir::$(yarn cache dir)" - uses: actions/cache@v2 + if: ${{ steps.check-build.outputs.build == 'strawberry' }} id: yarn-cache with: path: ${{ steps.yarn-cache-dir-path.outputs.dir }} @@ -79,6 +95,7 @@ jobs: ${{ runner.os }}-yarn- - name: Install Dependencies + if: ${{ steps.check-build.outputs.build == 'strawberry' }} run: bash ${GITHUB_WORKSPACE}/.github/helper/install_dependencies.sh env: BEFORE: ${{ env.GITHUB_EVENT_PATH.before }} @@ -86,18 +103,22 @@ jobs: TYPE: server - name: Install + if: ${{ steps.check-build.outputs.build == 'strawberry' }} run: bash ${GITHUB_WORKSPACE}/.github/helper/install.sh env: DB: mariadb TYPE: server - name: Run Tests + if: ${{ steps.check-build.outputs.build == 'strawberry' }} run: cd ~/frappe-bench/ && bench --site test_site run-parallel-tests --use-orchestrator --with-coverage env: CI_BUILD_ID: ${{ github.run_id }} ORCHESTRATOR_URL: http://test-orchestrator.frappe.io - name: Upload Coverage Data + if: ${{ steps.check-build.outputs.build == 'strawberry' }} + id: upload-coverage-data run: | cp ~/frappe-bench/sites/.coverage ${GITHUB_WORKSPACE} cd ${GITHUB_WORKSPACE} @@ -114,6 +135,7 @@ jobs: coveralls: name: Coverage Wrap Up needs: test + if: ${{ needs.test.steps.check-build.build == 'strawberry' }} container: python:3-slim runs-on: ubuntu-18.04 steps: diff --git a/.github/workflows/server-postgres-tests.yml b/.github/workflows/server-postgres-tests.yml index 4325eebaad..b2a283340c 100644 --- a/.github/workflows/server-postgres-tests.yml +++ b/.github/workflows/server-postgres-tests.yml @@ -37,17 +37,30 @@ jobs: with: python-version: 3.7 + - uses: jitterbit/get-changed-files@v1 + id: files + + - name: Check if build should be run + id: check-build + run: | + python "${GITHUB_WORKSPACE}/.github/helper/roulette.py" ${{ steps.files.outputs.all }} + env: + TYPE: "server" + - uses: actions/setup-node@v2 + if: ${{ steps.check-build.outputs.build == 'strawberry' }} with: node-version: '14' check-latest: true - name: Add to Hosts + if: ${{ steps.check-build.outputs.build == 'strawberry' }} run: | echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts echo "127.0.0.1 test_site_producer" | sudo tee -a /etc/hosts - name: Cache pip + if: ${{ steps.check-build.outputs.build == 'strawberry' }} uses: actions/cache@v2 with: path: ~/.cache/pip @@ -57,6 +70,7 @@ jobs: ${{ runner.os }}- - name: Cache node modules + if: ${{ steps.check-build.outputs.build == 'strawberry' }} uses: actions/cache@v2 env: cache-name: cache-node-modules @@ -69,10 +83,12 @@ jobs: ${{ runner.os }}- - name: Get yarn cache directory path + if: ${{ steps.check-build.outputs.build == 'strawberry' }} id: yarn-cache-dir-path run: echo "::set-output name=dir::$(yarn cache dir)" - uses: actions/cache@v2 + if: ${{ steps.check-build.outputs.build == 'strawberry' }} id: yarn-cache with: path: ${{ steps.yarn-cache-dir-path.outputs.dir }} @@ -81,6 +97,7 @@ jobs: ${{ runner.os }}-yarn- - name: Install Dependencies + if: ${{ steps.check-build.outputs.build == 'strawberry' }} run: bash ${GITHUB_WORKSPACE}/.github/helper/install_dependencies.sh env: BEFORE: ${{ env.GITHUB_EVENT_PATH.before }} @@ -88,12 +105,14 @@ jobs: TYPE: server - name: Install + if: ${{ steps.check-build.outputs.build == 'strawberry' }} run: bash ${GITHUB_WORKSPACE}/.github/helper/install.sh env: DB: postgres TYPE: server - name: Run Tests + if: ${{ steps.check-build.outputs.build == 'strawberry' }} run: cd ~/frappe-bench/ && bench --site test_site run-parallel-tests --use-orchestrator env: CI_BUILD_ID: ${{ github.run_id }} diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml index f342c0709e..af598d6c40 100644 --- a/.github/workflows/ui-tests.yml +++ b/.github/workflows/ui-tests.yml @@ -35,17 +35,30 @@ jobs: with: python-version: 3.7 + - uses: jitterbit/get-changed-files@v1 + id: files + + - name: Check if build should be run + id: check-build + run: | + python "${GITHUB_WORKSPACE}/.github/helper/roulette.py" ${{ steps.files.outputs.all }} + env: + TYPE: "ui" + - uses: actions/setup-node@v2 + if: ${{ steps.check-build.outputs.build == 'strawberry' }} with: node-version: 14 check-latest: true - name: Add to Hosts + if: ${{ steps.check-build.outputs.build == 'strawberry' }} run: | echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts echo "127.0.0.1 test_site_producer" | sudo tee -a /etc/hosts - name: Cache pip + if: ${{ steps.check-build.outputs.build == 'strawberry' }} uses: actions/cache@v2 with: path: ~/.cache/pip @@ -55,6 +68,7 @@ jobs: ${{ runner.os }}- - name: Cache node modules + if: ${{ steps.check-build.outputs.build == 'strawberry' }} uses: actions/cache@v2 env: cache-name: cache-node-modules @@ -67,10 +81,12 @@ jobs: ${{ runner.os }}- - name: Get yarn cache directory path + if: ${{ steps.check-build.outputs.build == 'strawberry' }} id: yarn-cache-dir-path run: echo "::set-output name=dir::$(yarn cache dir)" - uses: actions/cache@v2 + if: ${{ steps.check-build.outputs.build == 'strawberry' }} id: yarn-cache with: path: ${{ steps.yarn-cache-dir-path.outputs.dir }} @@ -79,6 +95,7 @@ jobs: ${{ runner.os }}-yarn- - name: Cache cypress binary + if: ${{ steps.check-build.outputs.build == 'strawberry' }} uses: actions/cache@v2 with: path: ~/.cache @@ -88,6 +105,7 @@ jobs: ${{ runner.os }}- - name: Install Dependencies + if: ${{ steps.check-build.outputs.build == 'strawberry' }} run: bash ${GITHUB_WORKSPACE}/.github/helper/install_dependencies.sh env: BEFORE: ${{ env.GITHUB_EVENT_PATH.before }} @@ -95,15 +113,18 @@ jobs: TYPE: ui - name: Install + if: ${{ steps.check-build.outputs.build == 'strawberry' }} run: bash ${GITHUB_WORKSPACE}/.github/helper/install.sh env: DB: mariadb TYPE: ui - name: Site Setup + if: ${{ steps.check-build.outputs.build == 'strawberry' }} run: cd ~/frappe-bench/ && bench --site test_site execute frappe.utils.install.complete_setup_wizard - name: UI Tests + if: ${{ steps.check-build.outputs.build == 'strawberry' }} run: cd ~/frappe-bench/ && bench --site test_site run-ui-tests frappe --headless --parallel --ci-build-id $GITHUB_RUN_ID env: CYPRESS_RECORD_KEY: 4a48f41c-11b3-425b-aa88-c58048fa69eb From 32759cfc909628ccfd246cebdd7930a0c4359335 Mon Sep 17 00:00:00 2001 From: ChillarAnand Date: Wed, 25 Aug 2021 08:02:02 +0530 Subject: [PATCH 228/306] fix: Passed failfast flag to unit test runner in all scenarios --- frappe/commands/utils.py | 2 +- frappe/test_runner.py | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/frappe/commands/utils.py b/frappe/commands/utils.py index f2395ae490..2092071198 100644 --- a/frappe/commands/utils.py +++ b/frappe/commands/utils.py @@ -524,7 +524,7 @@ def console(context): @click.option('--skip-test-records', is_flag=True, default=False, help="Don't create test records") @click.option('--skip-before-tests', is_flag=True, default=False, help="Don't run before tests hook") @click.option('--junit-xml-output', help="Destination file path for junit xml report") -@click.option('--failfast', is_flag=True, default=False) +@click.option('--failfast', is_flag=True, default=False, help="Stop the test run on the first error or failure") @pass_context def run_tests(context, app=None, module=None, doctype=None, test=(), profile=False, coverage=False, junit_xml_output=False, ui_tests = False, doctype_list_path=None, diff --git a/frappe/test_runner.py b/frappe/test_runner.py index 8112362f34..ed46c9c071 100644 --- a/frappe/test_runner.py +++ b/frappe/test_runner.py @@ -50,7 +50,7 @@ def main(app=None, module=None, doctype=None, verbose=False, tests=(), frappe.connect() # if not frappe.conf.get("db_name").startswith("test_"): - # raise Exception, 'db_name must start with "test_"' + # raise Exception, 'db_name must start with "test_"' # workaround! since there is no separate test db frappe.clear_cache() @@ -65,9 +65,9 @@ def main(app=None, module=None, doctype=None, verbose=False, tests=(), frappe.get_attr(fn)() if doctype: - ret = run_tests_for_doctype(doctype, verbose, tests, force, profile, junit_xml_output=junit_xml_output) + ret = run_tests_for_doctype(doctype, verbose, tests, force, profile, failfast=failfast, junit_xml_output=junit_xml_output) elif module: - ret = run_tests_for_module(module, verbose, tests, profile, junit_xml_output=junit_xml_output) + ret = run_tests_for_module(module, verbose, tests, profile, failfast=failfast, junit_xml_output=junit_xml_output) else: ret = run_all_tests(app, verbose, profile, ui_tests, failfast=failfast, junit_xml_output=junit_xml_output) @@ -150,7 +150,7 @@ def run_all_tests(app=None, verbose=False, profile=False, ui_tests=False, failfa return out -def run_tests_for_doctype(doctypes, verbose=False, tests=(), force=False, profile=False, junit_xml_output=False): +def run_tests_for_doctype(doctypes, verbose=False, tests=(), force=False, profile=False, failfast=False, junit_xml_output=False): modules = [] if not isinstance(doctypes, (list, tuple)): doctypes = [doctypes] @@ -168,18 +168,18 @@ def run_tests_for_doctype(doctypes, verbose=False, tests=(), force=False, profil make_test_records(doctype, verbose=verbose, force=force) modules.append(importlib.import_module(test_module)) - return _run_unittest(modules, verbose=verbose, tests=tests, profile=profile, junit_xml_output=junit_xml_output) + return _run_unittest(modules, verbose=verbose, tests=tests, profile=profile, failfast=failfast, junit_xml_output=junit_xml_output) -def run_tests_for_module(module, verbose=False, tests=(), profile=False, junit_xml_output=False): +def run_tests_for_module(module, verbose=False, tests=(), profile=False, failfast=False, junit_xml_output=False): module = importlib.import_module(module) if hasattr(module, "test_dependencies"): for doctype in module.test_dependencies: make_test_records(doctype, verbose=verbose) frappe.db.commit() - return _run_unittest(module, verbose=verbose, tests=tests, profile=profile, junit_xml_output=junit_xml_output) + return _run_unittest(module, verbose=verbose, tests=tests, profile=profile, failfast=failfast, junit_xml_output=junit_xml_output) -def _run_unittest(modules, verbose=False, tests=(), profile=False, junit_xml_output=False): +def _run_unittest(modules, verbose=False, tests=(), profile=False, failfast=False, junit_xml_output=False): frappe.db.begin() test_suite = unittest.TestSuite() @@ -198,9 +198,9 @@ def _run_unittest(modules, verbose=False, tests=(), profile=False, junit_xml_out test_suite.addTest(module_test_cases) if junit_xml_output: - runner = unittest_runner(verbosity=1+(verbose and 1 or 0)) + runner = unittest_runner(verbosity=1+(verbose and 1 or 0), failfast=failfast) else: - runner = unittest_runner(resultclass=TimeLoggingTestResult, verbosity=1+(verbose and 1 or 0)) + runner = unittest_runner(resultclass=TimeLoggingTestResult, verbosity=1+(verbose and 1 or 0), failfast=failfast) if profile: pr = cProfile.Profile() From c07298648ac6ea6b1613309e68f3c7a5d6bde419 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 25 Aug 2021 10:49:37 +0530 Subject: [PATCH 229/306] test: Blur the phone_nos field to enable validation for the field --- cypress/integration/form_tour.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cypress/integration/form_tour.js b/cypress/integration/form_tour.js index d2d39679a8..ab7ada9034 100644 --- a/cypress/integration/form_tour.js +++ b/cypress/integration/form_tour.js @@ -20,10 +20,10 @@ context('Form Tour', () => { it('navigates a form tour', () => { open_test_form_tour(); - cy.get('#driver-popover-item').should('be.visible'); + cy.get('.frappe-driver').should('be.visible'); cy.get('.frappe-control[data-fieldname="first_name"]').as('first_name'); cy.get('@first_name').should('have.class', 'driver-highlighted-element'); - cy.get('#driver-popover-item').findByRole('button', {name: 'Next'}).as('next_btn'); + cy.get('.frappe-driver').findByRole('button', {name: 'Next'}).as('next_btn'); // next btn shouldn't move to next step, if first name is not entered cy.get('@next_btn').click(); @@ -68,13 +68,13 @@ context('Form Tour', () => { cy.get('.grid-row-open .frappe-control[data-fieldname="phone"]').as('phone'); cy.get('@phone').should('have.class', 'driver-highlighted-element'); // enter value in a table field - cy.fill_table_field('phone_nos', '1', 'phone', '1234567890'); + let field = cy.fill_table_field('phone_nos', '1', 'phone', '1234567890'); + field.blur(); // move to collapse row step cy.wait(500); - cy.get('@next_btn').click(); + cy.get('.driver-popover-title').contains('Test Title 4').siblings().get('@next_btn').click(); cy.wait(500); - // collapse row cy.get('.grid-row-open .grid-collapse-row').click(); cy.wait(500); @@ -82,7 +82,7 @@ context('Form Tour', () => { // assert save btn is highlighted cy.get('.primary-action').should('have.class', 'driver-highlighted-element'); cy.wait(500); - cy.get('#driver-popover-item').findByRole('button', {name: 'Save'}).should('be.visible'); + cy.get('.frappe-driver').findByRole('button', {name: 'Save'}).should('be.visible'); }); }); From 0611c1698fd6bcc5444236df35dc05afb181f9ac Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 25 Aug 2021 11:30:51 +0530 Subject: [PATCH 230/306] refactor: File.optimize_file Simplified method logic --- frappe/core/doctype/file/file.py | 35 ++++++++++++++++---------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index f279a04a44..18aae13799 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -602,23 +602,25 @@ class File(Document): content_type = mimetypes.guess_type(self.file_name)[0] is_local_image = content_type.startswith('image/') and self.file_size > 0 is_svg = content_type == 'image/svg+xml' - if is_local_image and not is_svg: - content = self.get_content() - optimized_content = optimize_image(content, content_type) - - file_path = get_files_path(is_private=self.is_private) - file_path = os.path.join(file_path.encode('utf-8'), self.file_name.encode('utf-8')) - with open(file_path, 'wb+') as f: - f.write(optimized_content) - - self.file_size = len(optimized_content) - self.content_hash = get_content_hash(optimized_content) - self.save() - elif is_svg: - raise TypeError('Optimization of SVG images is not supported') - else: + + if not is_local_image: raise NotImplementedError('Only local image files can be optimized') + if is_svg: + raise TypeError('Optimization of SVG images is not supported') + + content = self.get_content() + optimized_content = optimize_image(content, content_type) + file_path = get_files_path(self.file_name, is_private=self.is_private) + + with open(file_path, 'wb+') as f: + f.write(optimized_content) + + self.file_size = len(optimized_content) + self.content_hash = get_content_hash(optimized_content) + self.save() + + def on_doctype_update(): frappe.db.add_index("File", ["attached_to_doctype", "attached_to_name"]) @@ -967,8 +969,7 @@ def unzip_file(name): @frappe.whitelist() def optimize_saved_image(doc_name): - file_doc = frappe.get_doc('File', doc_name) - file_doc.optimize_file() + frappe.get_doc('File', doc_name).optimize_file() @frappe.whitelist() def get_attached_images(doctype, names): From bc596e968159024ec956d30df6be92c5b31c7b19 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 25 Aug 2021 11:45:00 +0530 Subject: [PATCH 231/306] fix: Revert file on disk if rolledback --- frappe/core/doctype/file/file.py | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index 18aae13799..0c2832cdbd 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -321,8 +321,16 @@ class File(Document): self.delete_file_data_content(only_thumbnail=True) def on_rollback(self): - self.flags.on_rollback = True - self.on_trash() + # if original_content flag is set, this rollback should revert the file to its original state + if self.flags.original_content: + file_path = self.get_full_path() + with open(file_path, "wb+") as f: + f.write(self.flags.original_content) + + # following condition is only executed when an insert has been rolledback + else: + self.flags.on_rollback = True + self.on_trash() def unzip(self): '''Unzip current file and replace it by its children''' @@ -610,8 +618,8 @@ class File(Document): raise TypeError('Optimization of SVG images is not supported') content = self.get_content() + file_path = self.get_full_path() optimized_content = optimize_image(content, content_type) - file_path = get_files_path(self.file_name, is_private=self.is_private) with open(file_path, 'wb+') as f: f.write(optimized_content) @@ -620,6 +628,10 @@ class File(Document): self.content_hash = get_content_hash(optimized_content) self.save() + # if rolledback, revert back to original + self.flags.original_content = content + frappe.local.rollback_observers.append(self) + def on_doctype_update(): frappe.db.add_index("File", ["attached_to_doctype", "attached_to_name"]) From 75ff78e6bd1beefc9e9df8d2772f9ce1a7cfdb53 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 25 Aug 2021 12:03:33 +0530 Subject: [PATCH 232/306] fix(File): Remove extra API endpoint Got rid of frappe.core.doctype.file.file.optimize_saved_image in favour of whitelisted Document Action File.optimize_file --- frappe/core/doctype/file/file.js | 12 +++--------- frappe/core/doctype/file/file.py | 3 --- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/frappe/core/doctype/file/file.js b/frappe/core/doctype/file/file.js index bc0cc17553..202903f1ab 100644 --- a/frappe/core/doctype/file/file.js +++ b/frappe/core/doctype/file/file.js @@ -29,15 +29,9 @@ frappe.ui.form.on("File", "refresh", function(frm) { if (is_optimizable) { frm.add_custom_button(__("Optimize"), function() { frappe.show_alert(__("Optimizing image...")); - frappe.call({ - method: "frappe.core.doctype.file.file.optimize_saved_image", - args: { - doc_name: frm.doc.name, - }, - callback: function() { - frappe.show_alert(__("Image optimized")); - frappe.set_route("List", "File"); - } + frm.call("optimize_file").then(() => { + frappe.show_alert(__("Image optimized")); + frappe.set_route("List", "File"); }); }); } diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index 0c2832cdbd..369179eece 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -979,9 +979,6 @@ def unzip_file(name): files = file_obj.unzip() return len(files) -@frappe.whitelist() -def optimize_saved_image(doc_name): - frappe.get_doc('File', doc_name).optimize_file() @frappe.whitelist() def get_attached_images(doctype, names): From 004891237e77fb95b64a7f8b535774b30b3b1b02 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 25 Aug 2021 12:34:48 +0530 Subject: [PATCH 233/306] test: Fix flaky timeline_email tests --- cypress/integration/timeline_email.js | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/cypress/integration/timeline_email.js b/cypress/integration/timeline_email.js index e5b3ebeb7c..82af24e822 100644 --- a/cypress/integration/timeline_email.js +++ b/cypress/integration/timeline_email.js @@ -8,14 +8,13 @@ context('Timeline Email', () => { it('Adding new ToDo, adding email and verifying timeline content for email attachment, deleting attachment and ToDo', () => { //Adding new ToDo cy.click_listview_primary_button('Add ToDo'); - cy.get('.custom-actions > .btn').trigger('click', {delay: 500}); - cy.get('.row > .section-body > .form-column > form > .frappe-control > .form-group > .control-input-wrapper > .control-input > .ql-container > .ql-editor').eq(0).type('Test ToDo', {force: true}); + cy.get('.custom-actions:visible > .btn').contains("Edit in full page").click({delay: 500}); + cy.fill_field("description", "Test ToDo", "Text Editor"); cy.wait(500); - //cy.click_listview_primary_button('Save'); cy.get('.primary-action').contains('Save').click({force: true}); cy.wait(700); cy.visit('/app/todo'); - cy.get('.list-row > .level-left > .list-subject > .level-item.ellipsis > .ellipsis').eq(0).click(); + cy.get('.list-row > .level-left > .list-subject').eq(0).click(); //Creating a new email cy.get('.timeline-actions > .btn').click(); @@ -47,7 +46,7 @@ context('Timeline Email', () => { //Removing the added attachment cy.get('.attachment-row > .data-pill > .remove-btn > .icon').click(); - cy.get('.modal-dialog > .modal-content > .modal-footer > .standard-actions > .btn-primary').contains('Yes').click(); + cy.get('.modal-footer:visible > .standard-actions > .btn-primary').contains('Yes').click(); //To check if the removed attachment is shown in the timeline content cy.get('.timeline-content').should('contain', 'Removed 72402.jpg'); @@ -55,17 +54,17 @@ context('Timeline Email', () => { //To check if the discard button functionality in email is working correctly cy.get('.timeline-actions > .btn').click(); - cy.fill_field('recipients', 'test@example.com', 'MultiSelect'); + cy.fill_field('recipients', 'test@example.com', 'MultiSelect'); cy.get('.modal-footer > .standard-actions > .btn-secondary').contains('Discard').click(); cy.wait(500); cy.get('.timeline-actions > .btn').click(); cy.wait(500); cy.get_field('recipients', 'MultiSelect').should('have.text', ''); - cy.get('.modal.show > .modal-dialog > .modal-content > .modal-header > .modal-actions > .btn-modal-close > .icon').click(); + cy.get('.modal-header:visible > .modal-actions > .btn-modal-close > .icon').click(); //Deleting the added ToDo - cy.get('#page-ToDo > .page-head > .container > .row > .col > .standard-actions > .menu-btn-group > .btn').click(); - cy.get('.menu-btn-group > .dropdown-menu > li > .grey-link').eq(17).click(); - cy.get('.modal.show > .modal-dialog > .modal-content > .modal-footer > .standard-actions > .btn-primary').click(); + cy.get('.menu-btn-group:visible > .btn').click(); + cy.get('.menu-btn-group:visible > .dropdown-menu > li > .dropdown-item').contains('Delete').click(); + cy.get('.modal-footer:visible > .standard-actions > .btn-primary').click(); }); }); From e01ef7ff52eeda80c267258ae51271a5f412b086 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 25 Aug 2021 12:40:44 +0530 Subject: [PATCH 234/306] ci(roulette): Use GitHub REST to figure out changed files --- .github/helper/roulette.py | 20 +++++++++++++------- .github/workflows/patch-mariadb-tests.yml | 6 ++---- .github/workflows/server-mariadb-tests.yml | 6 ++---- .github/workflows/server-postgres-tests.yml | 6 ++---- .github/workflows/ui-tests.yml | 6 ++---- 5 files changed, 21 insertions(+), 23 deletions(-) diff --git a/.github/helper/roulette.py b/.github/helper/roulette.py index ce4c8ed633..311f15c9db 100644 --- a/.github/helper/roulette.py +++ b/.github/helper/roulette.py @@ -1,5 +1,6 @@ import os import re +import requests import shlex import subprocess import sys @@ -14,19 +15,24 @@ def is_py(file): return file.endswith("py") def is_ci(file): - return file.endswith("yml") or ".github" in file + return ".github" in file -def is_js(file): - return file.endswith("js") +def is_frontend_code(file): + return file.endswith((".css", ".scss", ".less", ".sass", ".styl", ".js", ".ts")) def is_docs(file): - regex = re.compile(r'\.(md|png|jpg|jpeg)$|^.github|LICENSE') + regex = re.compile(r'\.(md|png|jpg|jpeg|csv)$|^.github|LICENSE') return bool(regex.search(file)) if __name__ == "__main__": files_list = sys.argv[1:] build_type = os.environ.get("TYPE") + pr_number = os.environ.get("PR_NUMBER") + + if not files_list and pr_number: + res = requests.get(f"https://api.github.com/repos/frappe/frappe/pulls/{pr_number}/files") + files_list = [f["filename"] for f in res.json()] if not files_list: print("No files' changes detected. Build is shutting") @@ -34,7 +40,7 @@ if __name__ == "__main__": ci_files_changed = any(f for f in files_list if is_ci(f)) only_docs_changed = len(list(filter(is_docs, files_list))) == len(files_list) - only_js_changed = len(list(filter(is_js, files_list))) == len(files_list) + only_frontend_code_changed = len(list(filter(is_frontend_code, files_list))) == len(files_list) only_py_changed = len(list(filter(is_py, files_list))) == len(files_list) if ci_files_changed: @@ -44,8 +50,8 @@ if __name__ == "__main__": print("Only docs were updated, stopping build process.") sys.exit(0) - if only_js_changed and build_type == "server": - print("Only JavaScript code was updated; Stopping Python build process.") + if only_frontend_code_changed and build_type == "server": + print("Only Frontend code was updated; Stopping Python build process.") sys.exit(0) if only_py_changed and build_type == "ui": diff --git a/.github/workflows/patch-mariadb-tests.yml b/.github/workflows/patch-mariadb-tests.yml index 27776fb2f1..d0de566e9d 100644 --- a/.github/workflows/patch-mariadb-tests.yml +++ b/.github/workflows/patch-mariadb-tests.yml @@ -26,15 +26,13 @@ jobs: with: python-version: 3.7 - - uses: jitterbit/get-changed-files@v1 - id: files - - name: Check if build should be run id: check-build run: | - python "${GITHUB_WORKSPACE}/.github/helper/roulette.py" ${{ steps.files.outputs.all }} + python "${GITHUB_WORKSPACE}/.github/helper/roulette.py" env: TYPE: "server" + PR_NUMBER: ${{ github.event.number }} - name: Add to Hosts if: ${{ steps.check-build.outputs.build == 'strawberry' }} diff --git a/.github/workflows/server-mariadb-tests.yml b/.github/workflows/server-mariadb-tests.yml index d6d5097a09..da9724c6bd 100644 --- a/.github/workflows/server-mariadb-tests.yml +++ b/.github/workflows/server-mariadb-tests.yml @@ -35,15 +35,13 @@ jobs: with: python-version: 3.7 - - uses: jitterbit/get-changed-files@v1 - id: files - - name: Check if build should be run id: check-build run: | - python "${GITHUB_WORKSPACE}/.github/helper/roulette.py" ${{ steps.files.outputs.all }} + python "${GITHUB_WORKSPACE}/.github/helper/roulette.py" env: TYPE: "server" + PR_NUMBER: ${{ github.event.number }} - uses: actions/setup-node@v2 if: ${{ steps.check-build.outputs.build == 'strawberry' }} diff --git a/.github/workflows/server-postgres-tests.yml b/.github/workflows/server-postgres-tests.yml index b2a283340c..d7658bc1ba 100644 --- a/.github/workflows/server-postgres-tests.yml +++ b/.github/workflows/server-postgres-tests.yml @@ -37,15 +37,13 @@ jobs: with: python-version: 3.7 - - uses: jitterbit/get-changed-files@v1 - id: files - - name: Check if build should be run id: check-build run: | - python "${GITHUB_WORKSPACE}/.github/helper/roulette.py" ${{ steps.files.outputs.all }} + python "${GITHUB_WORKSPACE}/.github/helper/roulette.py" env: TYPE: "server" + PR_NUMBER: ${{ github.event.number }} - uses: actions/setup-node@v2 if: ${{ steps.check-build.outputs.build == 'strawberry' }} diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml index af598d6c40..90c72e7018 100644 --- a/.github/workflows/ui-tests.yml +++ b/.github/workflows/ui-tests.yml @@ -35,15 +35,13 @@ jobs: with: python-version: 3.7 - - uses: jitterbit/get-changed-files@v1 - id: files - - name: Check if build should be run id: check-build run: | - python "${GITHUB_WORKSPACE}/.github/helper/roulette.py" ${{ steps.files.outputs.all }} + python "${GITHUB_WORKSPACE}/.github/helper/roulette.py" env: TYPE: "ui" + PR_NUMBER: ${{ github.event.number }} - uses: actions/setup-node@v2 if: ${{ steps.check-build.outputs.build == 'strawberry' }} From 2865b35673a3bc3158ceed3c784f19e7cae2b9f8 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 25 Aug 2021 12:43:03 +0530 Subject: [PATCH 235/306] patch: set title as label if extends is empty --- frappe/patches/v14_0/update_workspace2.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/patches/v14_0/update_workspace2.py b/frappe/patches/v14_0/update_workspace2.py index 2d7eb4cc76..1a56310a6c 100644 --- a/frappe/patches/v14_0/update_workspace2.py +++ b/frappe/patches/v14_0/update_workspace2.py @@ -54,7 +54,7 @@ def update_wspace(doc, seq, content): doc.sequence_id = seq + 1 doc.content = json.dumps(content) doc.public = 0 - doc.title = doc.extends + doc.title = doc.extends or doc.label doc.extends = '' doc.category = '' doc.onboarding = '' From 4a468c14d3eacba8274842a8cfa99a7c316a479b Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 25 Aug 2021 13:02:27 +0530 Subject: [PATCH 236/306] fix: updated pah --- frappe/patches.txt | 2 +- frappe/patches/v14_0/update_workspace2.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/patches.txt b/frappe/patches.txt index 87919b0247..41ca1a1724 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -182,4 +182,4 @@ frappe.patches.v13_0.jinja_hook frappe.patches.v13_0.update_notification_channel_if_empty frappe.patches.v14_0.drop_data_import_legacy frappe.patches.v14_0.rename_cancelled_documents -frappe.patches.v14_0.update_workspace2 +frappe.patches.v14_0.update_workspace2 # 25.08.2021 diff --git a/frappe/patches/v14_0/update_workspace2.py b/frappe/patches/v14_0/update_workspace2.py index 1a56310a6c..4974919049 100644 --- a/frappe/patches/v14_0/update_workspace2.py +++ b/frappe/patches/v14_0/update_workspace2.py @@ -50,7 +50,7 @@ def create_content(doc): return content def update_wspace(doc, seq, content): - if not doc.is_standard and not doc.public: + if not doc.title and not content and not doc.is_standard and not doc.public: doc.sequence_id = seq + 1 doc.content = json.dumps(content) doc.public = 0 From 82c354e9187140eaf81b722086edb00cea946ec4 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 25 Aug 2021 13:03:40 +0530 Subject: [PATCH 237/306] fix: updated patch --- frappe/patches/v14_0/update_workspace2.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/patches/v14_0/update_workspace2.py b/frappe/patches/v14_0/update_workspace2.py index 4974919049..c212faee76 100644 --- a/frappe/patches/v14_0/update_workspace2.py +++ b/frappe/patches/v14_0/update_workspace2.py @@ -50,7 +50,7 @@ def create_content(doc): return content def update_wspace(doc, seq, content): - if not doc.title and not content and not doc.is_standard and not doc.public: + if not doc.title and not doc.content and not doc.is_standard and not doc.public: doc.sequence_id = seq + 1 doc.content = json.dumps(content) doc.public = 0 From fe060bda0ee83843fa7af65958fe099337ffeec0 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 25 Aug 2021 13:25:40 +0530 Subject: [PATCH 238/306] fix: Use urllib instead of requests Simply because "too much effort" to add another library pfft --- .github/helper/roulette.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/helper/roulette.py b/.github/helper/roulette.py index 311f15c9db..002f1e1017 100644 --- a/.github/helper/roulette.py +++ b/.github/helper/roulette.py @@ -1,11 +1,18 @@ +import json import os import re -import requests import shlex import subprocess import sys +import urllib.request +def get_files_list(pr_number): + req = urllib.request.Request(f"https://api.github.com/repos/frappe/frappe/pulls/{pr_number}/files") + res = urllib.request.urlopen(req) + dump = json.loads(res.read().decode('utf8')) + return [change["filename"] for change in dump] + def get_output(command, shell=True): print(command) command = shlex.split(command) @@ -31,8 +38,7 @@ if __name__ == "__main__": pr_number = os.environ.get("PR_NUMBER") if not files_list and pr_number: - res = requests.get(f"https://api.github.com/repos/frappe/frappe/pulls/{pr_number}/files") - files_list = [f["filename"] for f in res.json()] + files_list = get_files_list(pr_number=pr_number) if not files_list: print("No files' changes detected. Build is shutting") From e2585cbc7e5aa1921816a3cc54e16dac791d77e2 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 25 Aug 2021 13:46:09 +0530 Subject: [PATCH 239/306] ci(roulette): Add support for running on forks --- .github/helper/roulette.py | 7 ++++--- .github/workflows/patch-mariadb-tests.yml | 1 + .github/workflows/server-mariadb-tests.yml | 1 + .github/workflows/server-postgres-tests.yml | 1 + .github/workflows/ui-tests.yml | 1 + 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/helper/roulette.py b/.github/helper/roulette.py index 002f1e1017..5c934bc697 100644 --- a/.github/helper/roulette.py +++ b/.github/helper/roulette.py @@ -7,8 +7,8 @@ import sys import urllib.request -def get_files_list(pr_number): - req = urllib.request.Request(f"https://api.github.com/repos/frappe/frappe/pulls/{pr_number}/files") +def get_files_list(pr_number, repo="frappe/frappe"): + req = urllib.request.Request(f"https://api.github.com/repos/{repo}/pulls/{pr_number}/files") res = urllib.request.urlopen(req) dump = json.loads(res.read().decode('utf8')) return [change["filename"] for change in dump] @@ -36,9 +36,10 @@ if __name__ == "__main__": files_list = sys.argv[1:] build_type = os.environ.get("TYPE") pr_number = os.environ.get("PR_NUMBER") + repo = os.environ.get("REPO_NAME") if not files_list and pr_number: - files_list = get_files_list(pr_number=pr_number) + files_list = get_files_list(pr_number=pr_number, repo=repo) if not files_list: print("No files' changes detected. Build is shutting") diff --git a/.github/workflows/patch-mariadb-tests.yml b/.github/workflows/patch-mariadb-tests.yml index d0de566e9d..6ccc059afb 100644 --- a/.github/workflows/patch-mariadb-tests.yml +++ b/.github/workflows/patch-mariadb-tests.yml @@ -33,6 +33,7 @@ jobs: env: TYPE: "server" PR_NUMBER: ${{ github.event.number }} + REPO_NAME: ${{ github.repository }} - name: Add to Hosts if: ${{ steps.check-build.outputs.build == 'strawberry' }} diff --git a/.github/workflows/server-mariadb-tests.yml b/.github/workflows/server-mariadb-tests.yml index da9724c6bd..65b6666678 100644 --- a/.github/workflows/server-mariadb-tests.yml +++ b/.github/workflows/server-mariadb-tests.yml @@ -42,6 +42,7 @@ jobs: env: TYPE: "server" PR_NUMBER: ${{ github.event.number }} + REPO_NAME: ${{ github.repository }} - uses: actions/setup-node@v2 if: ${{ steps.check-build.outputs.build == 'strawberry' }} diff --git a/.github/workflows/server-postgres-tests.yml b/.github/workflows/server-postgres-tests.yml index d7658bc1ba..17a0f6f94f 100644 --- a/.github/workflows/server-postgres-tests.yml +++ b/.github/workflows/server-postgres-tests.yml @@ -44,6 +44,7 @@ jobs: env: TYPE: "server" PR_NUMBER: ${{ github.event.number }} + REPO_NAME: ${{ github.repository }} - uses: actions/setup-node@v2 if: ${{ steps.check-build.outputs.build == 'strawberry' }} diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml index 90c72e7018..d56433c216 100644 --- a/.github/workflows/ui-tests.yml +++ b/.github/workflows/ui-tests.yml @@ -42,6 +42,7 @@ jobs: env: TYPE: "ui" PR_NUMBER: ${{ github.event.number }} + REPO_NAME: ${{ github.repository }} - uses: actions/setup-node@v2 if: ${{ steps.check-build.outputs.build == 'strawberry' }} From 525923d21383f3e03ee645c07fe6652415730ac2 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 25 Aug 2021 15:23:00 +0530 Subject: [PATCH 240/306] fix(roulette): Run only one conditional block --- .github/helper/roulette.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/helper/roulette.py b/.github/helper/roulette.py index 5c934bc697..d00c47d8d7 100644 --- a/.github/helper/roulette.py +++ b/.github/helper/roulette.py @@ -53,15 +53,15 @@ if __name__ == "__main__": if ci_files_changed: print("CI related files were updated, running all build processes.") - if only_docs_changed: + elif only_docs_changed: print("Only docs were updated, stopping build process.") sys.exit(0) - if only_frontend_code_changed and build_type == "server": + elif only_frontend_code_changed and build_type == "server": print("Only Frontend code was updated; Stopping Python build process.") sys.exit(0) - if only_py_changed and build_type == "ui": + elif only_py_changed and build_type == "ui": print("Only Python code was updated, stopping Cypress build process.") sys.exit(0) From 586835a833b5cbc01ff4ef01986d8c985bab5e1c Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 25 Aug 2021 06:09:29 -0400 Subject: [PATCH 241/306] fix: Duplicate name columns in list_view when no title field defined (#14006) * fix duplicate name columns in list_view when no title field defined * refactor: Simplify code Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> --- frappe/public/js/frappe/list/list_view.js | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js index 8a0e43c8f3..3cdecd8ddb 100644 --- a/frappe/public/js/frappe/list/list_view.js +++ b/frappe/public/js/frappe/list/list_view.js @@ -367,6 +367,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { if ( !this.settings.hide_name_column && + this.meta.title_field && this.meta.title_field !== 'name' ) { this.columns.push({ From 3e1d9dcbe392b962905e0c18e7d11e7abb434e66 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 25 Aug 2021 15:40:30 +0530 Subject: [PATCH 242/306] chore(workspace): Comment out flaky test --- .../desk/doctype/workspace/test_workspace.py | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/frappe/desk/doctype/workspace/test_workspace.py b/frappe/desk/doctype/workspace/test_workspace.py index 8aa3d57adf..f13a136c20 100644 --- a/frappe/desk/doctype/workspace/test_workspace.py +++ b/frappe/desk/doctype/workspace/test_workspace.py @@ -12,19 +12,20 @@ class TestWorkspace(unittest.TestCase): frappe.db.delete("DocType", {"module": "Test Module"}) frappe.delete_doc("Module Def", "Test Module") - def test_workspace_with_cards_specific_to_a_country(self): - workspace = create_workspace() - insert_card(workspace, "Card Label 1", "DocType 1", "DocType 2", "France") - insert_card(workspace, "Card Label 2", "DocType A", "DocType B") + # TODO: FIX ME - flaky test!!! + # def test_workspace_with_cards_specific_to_a_country(self): + # workspace = create_workspace() + # insert_card(workspace, "Card Label 1", "DocType 1", "DocType 2", "France") + # insert_card(workspace, "Card Label 2", "DocType A", "DocType B") - workspace.insert(ignore_if_duplicate = True) + # workspace.insert(ignore_if_duplicate = True) - cards = workspace.get_link_groups() + # cards = workspace.get_link_groups() - if frappe.get_system_settings('country') == "France": - self.assertEqual(len(cards), 2) - else: - self.assertEqual(len(cards), 1) + # if frappe.get_system_settings('country') == "France": + # self.assertEqual(len(cards), 2) + # else: + # self.assertEqual(len(cards), 1) def create_module(module_name): module = frappe.get_doc({ @@ -91,4 +92,4 @@ def create_doctype(doctype_name, module): 'permissions': [ {'role': 'System Manager'} ] - }).insert(ignore_if_duplicate = True) \ No newline at end of file + }).insert(ignore_if_duplicate = True) From 383c657b9f79c5ee390d37ae3e01539b01a1ac4e Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 25 Aug 2021 16:21:59 +0530 Subject: [PATCH 243/306] fix: Total Row is hidden in Query Report & Script Report --- frappe/public/js/frappe/views/reports/query_report.js | 4 ++++ frappe/public/scss/desk/report.scss | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index f13f683d79..ea0d904d0f 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -854,6 +854,10 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { } }; + if (this.raw_data.add_total_row) { + this.page.body[0].style.setProperty('--report-total-height', '310px'); + } + if (this.report_settings.get_datatable_options) { datatable_options = this.report_settings.get_datatable_options(datatable_options); } diff --git a/frappe/public/scss/desk/report.scss b/frappe/public/scss/desk/report.scss index e2aae431aa..2389a4f8f6 100644 --- a/frappe/public/scss/desk/report.scss +++ b/frappe/public/scss/desk/report.scss @@ -84,8 +84,9 @@ margin-bottom: 10px; } -.layout-main-section .frappe-card { +.layout-main-section { --report-filter-height: 0px; + --report-total-height: 275px; } .report-wrapper { @@ -95,7 +96,7 @@ height: calc(100vh - var(--report-filter-height) - 205px); .dt-scrollable { - height: calc(100vh - var(--report-filter-height) - 275px); + height: calc(100vh - var(--report-filter-height) - var(--report-total-height)); } } } From 0b4d084ceb6b3fa5c26e3622674cf24352b350bf Mon Sep 17 00:00:00 2001 From: MitulDavid Date: Wed, 25 Aug 2021 17:14:32 +0530 Subject: [PATCH 244/306] fix: Flags not set on error during .save() --- frappe/core/doctype/file/file.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index e747ca2b91..36ff67ce7c 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -563,12 +563,10 @@ class File(Document): self.file_size = len(optimized_content) self.content_hash = get_content_hash(optimized_content) - self.save() - # if rolledback, revert back to original self.flags.original_content = content frappe.local.rollback_observers.append(self) - + self.save() def on_doctype_update(): frappe.db.add_index("File", ["attached_to_doctype", "attached_to_name"]) From 15ba0fbe3e22f85a61bfae00481ec5ad18022e78 Mon Sep 17 00:00:00 2001 From: MitulDavid Date: Wed, 25 Aug 2021 17:15:29 +0530 Subject: [PATCH 245/306] refactor: Remove set_route after optimization --- frappe/core/doctype/file/file.js | 1 - 1 file changed, 1 deletion(-) diff --git a/frappe/core/doctype/file/file.js b/frappe/core/doctype/file/file.js index 202903f1ab..d40328d3cd 100644 --- a/frappe/core/doctype/file/file.js +++ b/frappe/core/doctype/file/file.js @@ -31,7 +31,6 @@ frappe.ui.form.on("File", "refresh", function(frm) { frappe.show_alert(__("Optimizing image...")); frm.call("optimize_file").then(() => { frappe.show_alert(__("Image optimized")); - frappe.set_route("List", "File"); }); }); } From 23c34183f344292886859b334fddba5892904541 Mon Sep 17 00:00:00 2001 From: MitulDavid Date: Wed, 25 Aug 2021 17:17:39 +0530 Subject: [PATCH 246/306] test: Add tests for optimize_file --- frappe/core/doctype/file/test_file.py | 63 +++++++++++++++++++++++++++ frappe/tests/data/sample_svg.svg | 12 +++++ 2 files changed, 75 insertions(+) create mode 100644 frappe/tests/data/sample_svg.svg diff --git a/frappe/core/doctype/file/test_file.py b/frappe/core/doctype/file/test_file.py index 5478d7ab85..745ff88e71 100644 --- a/frappe/core/doctype/file/test_file.py +++ b/frappe/core/doctype/file/test_file.py @@ -440,6 +440,69 @@ class TestFile(unittest.TestCase): }).insert(ignore_permissions=True) self.assertRaisesRegex(frappe.exceptions.ValidationError, 'not a zip file', test_file.unzip) + def test_optimize_file(self): + file_path = frappe.get_app_path("frappe", "tests/data/sample_image_for_optimization.jpg") + with open(file_path, "rb") as f: + file_content = f.read() + test_file = frappe.get_doc({ + "doctype": "File", + "file_name": "sample_image_for_optimization.jpg", + "content": file_content + }).insert() + original_size = test_file.file_size + original_content_hash = test_file.content_hash + + test_file.optimize_file() + optimized_size = test_file.file_size + updated_content_hash = test_file.content_hash + + self.assertLess(optimized_size, original_size) + self.assertNotEqual(original_content_hash, updated_content_hash) + test_file.delete() + + def test_optimize_svg(self): + file_path = frappe.get_app_path("frappe", "tests/data/sample_svg.svg") + with open(file_path, "rb") as f: + file_content = f.read() + test_file = frappe.get_doc({ + "doctype": "File", + "file_name": "sample_svg.svg", + "content": file_content + }).insert() + self.assertRaises(TypeError, test_file.optimize_file) + test_file.delete() + + def test_optimize_textfile(self): + test_file = frappe.get_doc({ + "doctype": "File", + "file_name": "sample_text.txt", + "content": "Text files cannot be optimized" + }).insert() + self.assertRaises(NotImplementedError, test_file.optimize_file) + test_file.delete() + + def test_optimize_folder(self): + test_folder = frappe.get_doc("File", "Home/Attachments") + self.assertRaises(TypeError, test_folder.optimize_file) + + def test_revert_optimized_file_on_rollback(self): + file_path = frappe.get_app_path("frappe", "tests/data/sample_image_for_optimization.jpg") + with open(file_path, "rb") as f: + file_content = f.read() + test_file = frappe.get_doc({ + "doctype": "File", + "file_name": "sample_image_for_optimization.jpg", + "content": file_content + }).insert() + image_path = test_file.get_full_path() + size_before_optimization = os.stat(image_path).st_size + + test_file.optimize_file() + frappe.db.rollback() + size_after_rollback = os.stat(image_path).st_size + self.assertEqual(size_before_optimization, size_after_rollback) + test_file.delete() + class TestAttachment(unittest.TestCase): test_doctype = 'Test For Attachment' diff --git a/frappe/tests/data/sample_svg.svg b/frappe/tests/data/sample_svg.svg new file mode 100644 index 0000000000..9fcb3c8242 --- /dev/null +++ b/frappe/tests/data/sample_svg.svg @@ -0,0 +1,12 @@ + + + + Artboard + Created with Sketch. + + + + + + + \ No newline at end of file From 678474c6529fb564084cda210f17554edb5fddc1 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 25 Aug 2021 17:23:44 +0530 Subject: [PATCH 247/306] chore: Using jquery to set css --- frappe/public/js/frappe/views/reports/query_report.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index ea0d904d0f..1053f9b7c5 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -855,7 +855,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { }; if (this.raw_data.add_total_row) { - this.page.body[0].style.setProperty('--report-total-height', '310px'); + this.$page.find('.layout-main-section').css('--report-total-height', '310px'); } if (this.report_settings.get_datatable_options) { From 55d22e185badcc5fd46ad3726c9466798c55fd49 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Wed, 25 Aug 2021 19:44:52 +0530 Subject: [PATCH 248/306] chore: extend editorconfig to vue components --- .editorconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index 24f122a8d4..d76f67cd7f 100644 --- a/.editorconfig +++ b/.editorconfig @@ -9,6 +9,6 @@ trim_trailing_whitespace = true charset = utf-8 # python, js indentation settings -[{*.py,*.js}] +[{*.py,*.js,*.vue}] indent_style = tab indent_size = 4 From 1bebe288768325d66414b51c9fef38b5ca1927d4 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Wed, 25 Aug 2021 19:43:18 +0530 Subject: [PATCH 249/306] feat: import/export full recorder captures --- .../js/frappe/recorder/RecorderDetail.vue | 38 ++++++++++++++++--- .../js/frappe/recorder/RequestDetail.vue | 25 +++++++----- frappe/recorder.py | 7 ++++ 3 files changed, 56 insertions(+), 14 deletions(-) diff --git a/frappe/public/js/frappe/recorder/RecorderDetail.vue b/frappe/public/js/frappe/recorder/RecorderDetail.vue index d17a8f0ec4..8b95612201 100644 --- a/frappe/public/js/frappe/recorder/RecorderDetail.vue +++ b/frappe/public/js/frappe/recorder/RecorderDetail.vue @@ -1,5 +1,5 @@