From e56e457fd264f3a976fb2df2ea09da358dc93362 Mon Sep 17 00:00:00 2001 From: Robert Wagner Date: Thu, 10 Dec 2020 15:39:28 -0500 Subject: [PATCH] Start converting to native classes (#671) * Start converting to native classes * Fix lint --- .../docs-code-highlight/component.js | 15 +- addon/components/docs-demo/component.js | 75 ++--- .../docs-demo/x-example/component.js | 15 +- addon/components/docs-link/component.js | 10 +- addon/components/docs-logo/component.js | 29 +- addon/components/docs-snippet/component.js | 22 +- .../x-autogenerated-api-docs/component.js | 34 ++- .../module-nav/component.js | 10 +- .../x-current-page-index/component.js | 13 +- .../docs-viewer/x-main/component.js | 59 ++-- .../docs-viewer/x-nav-list/component.js | 19 +- package.json | 4 +- yarn.lock | 260 ++++++++++++++++-- 13 files changed, 412 insertions(+), 153 deletions(-) diff --git a/addon/components/docs-code-highlight/component.js b/addon/components/docs-code-highlight/component.js index 32efe578b..ec7cb6584 100644 --- a/addon/components/docs-code-highlight/component.js +++ b/addon/components/docs-code-highlight/component.js @@ -1,3 +1,5 @@ +import classic from 'ember-classic-decorator'; +import { classNameBindings, tagName, layout as templateLayout } from '@ember-decorators/component'; import Component from '@ember/component'; import layout from './template'; import hljs from 'highlight.js/lib/core'; @@ -27,13 +29,14 @@ hljs.registerLanguage('sh', shell); hljs.registerLanguage('typescript', typescript); hljs.registerLanguage('ts', typescript); -export default Component.extend({ - tagName: 'pre', - classNameBindings: ['language'], - layout, +@classic +@tagName('pre') +@classNameBindings('language') +@templateLayout(layout) +export default class DocsCodeHighlight extends Component { didInsertElement() { - this._super.apply(this, arguments); + super.didInsertElement(...arguments); hljs.highlightBlock(this.element); } -}); +} diff --git a/addon/components/docs-demo/component.js b/addon/components/docs-demo/component.js index f8c117fb6..88be7cdd6 100644 --- a/addon/components/docs-demo/component.js +++ b/addon/components/docs-demo/component.js @@ -1,4 +1,6 @@ -import { computed } from '@ember/object'; +import classic from 'ember-classic-decorator'; +import { tagName, layout as templateLayout } from '@ember-decorators/component'; +import { action, computed } from '@ember/object'; import { A } from '@ember/array'; import Component from '@ember/component'; import layout from './template'; @@ -27,15 +29,15 @@ import layout from './template'; @yield {Component} demo.snippet @yield {Component} demo.liveExample */ -export default Component.extend({ - layout, - tagName: '', - +@classic +@templateLayout(layout) +@tagName('') +export default class DocsDemo extends Component { init() { - this._super(...arguments); + super.init(...arguments); this.set('snippetRegistrations', A()); - }, + } /** The snippets registered with this demo component @@ -43,7 +45,7 @@ export default Component.extend({ @field snippetRegistrations @type Array */ - snippetRegistrations: null, + snippetRegistrations = null; /** The finalized snippets complete with name (or default), language, @@ -54,7 +56,8 @@ export default Component.extend({ @type Array @readOnly */ - snippets: computed('activeSnippet', 'snippetRegistrations.[]', function() { + @computed('activeSnippet', 'snippetRegistrations.[]') + get snippets() { let activeSnippet = this.activeSnippet; return this.snippetRegistrations @@ -67,7 +70,7 @@ export default Component.extend({ language: language || defaults.language }; }) - }), + } /** Returns the default label and language based on snippet file name @@ -102,32 +105,32 @@ export default Component.extend({ } return { label, language }; - }, - - actions: { - /** - Registers snippets with the demo component and sets it to the active - snippet if it's the only one - - @action registerSnippet - @param {Object} snippet - */ - registerSnippet(snippet) { - this.snippetRegistrations.pushObject(snippet); - - if (this.get('snippetRegistrations.length') === 1) { - this.set('activeSnippet', snippet.name); - } - }, - - /** - Sets the active snippet - - @action selectSnippet - @param {Object} snippet - */ - selectSnippet(snippet) { + } + + /** + Registers snippets with the demo component and sets it to the active + snippet if it's the only one + + @action registerSnippet + @param {Object} snippet + */ + @action + registerSnippet(snippet) { + this.snippetRegistrations.pushObject(snippet); + + if (this.get('snippetRegistrations.length') === 1) { this.set('activeSnippet', snippet.name); } } -}); + + /** + Sets the active snippet + + @action selectSnippet + @param {Object} snippet + */ + @action + selectSnippet(snippet) { + this.set('activeSnippet', snippet.name); + } +} diff --git a/addon/components/docs-demo/x-example/component.js b/addon/components/docs-demo/x-example/component.js index 675c8b788..ac27f78f5 100644 --- a/addon/components/docs-demo/x-example/component.js +++ b/addon/components/docs-demo/x-example/component.js @@ -1,13 +1,14 @@ +import classic from 'ember-classic-decorator'; +import { classNames, layout as templateLayout } from '@ember-decorators/component'; import Component from '@ember/component'; import layout from './template'; -export default Component.extend({ - layout, - - classNames: 'docs-p-4', - +@classic +@templateLayout(layout) +@classNames('docs-p-4') +export default class XExample extends Component { init() { - this._super(...arguments); + super.init(...arguments); this.set('elementId', 'example-' + this.name); } -}); +} diff --git a/addon/components/docs-link/component.js b/addon/components/docs-link/component.js index 30e4fc6f0..d353cf512 100644 --- a/addon/components/docs-link/component.js +++ b/addon/components/docs-link/component.js @@ -1,3 +1,5 @@ +import classic from 'ember-classic-decorator'; +import { classNames } from '@ember-decorators/component'; import LinkComponent from '@ember/routing/link-component'; /** @@ -10,8 +12,6 @@ import LinkComponent from '@ember/routing/link-component'; @class DocsLink @public */ -export default LinkComponent.extend({ - - classNames: 'docs-md__a' - -}); +@classic +@classNames('docs-md__a') +export default class DocsLink extends LinkComponent {} diff --git a/addon/components/docs-logo/component.js b/addon/components/docs-logo/component.js index e4fc0dda0..703c55f40 100644 --- a/addon/components/docs-logo/component.js +++ b/addon/components/docs-logo/component.js @@ -1,3 +1,5 @@ +import classic from 'ember-classic-decorator'; +import { tagName, layout as templateLayout } from '@ember-decorators/component'; import { equal } from '@ember/object/computed'; import { assert } from '@ember/debug'; import Component from '@ember/component'; @@ -9,10 +11,10 @@ import layout from './template'; @class DocsLogo @public */ -export default Component.extend({ - layout, - tagName: '', - +@classic +@templateLayout(layout) +@tagName('') +export default class DocsLogo extends Component { /** Render either the 'ember', 'ember-cli' or 'ember-data' logo: @@ -25,17 +27,22 @@ export default Component.extend({ @argument logo @type String */ - logo: 'ember', + logo = 'ember'; didReceiveAttrs() { - this._super(...arguments); + super.didReceiveAttrs(...arguments); let logo = this.logo; let validLogos = ['ember', 'ember-cli', 'ember-data']; assert(`You passed "${logo}" to the docs-logo component, but the only valid options are [${validLogos}].`, validLogos.includes(logo)); - }, + } + + @equal('logo', 'ember') + showEmber; + + @equal('logo', 'ember-cli') + showEmberCli; - showEmber: equal('logo', 'ember'), - showEmberCli: equal('logo', 'ember-cli'), - showEmberData: equal('logo', 'ember-data') -}); + @equal('logo', 'ember-data') + showEmberData; +} diff --git a/addon/components/docs-snippet/component.js b/addon/components/docs-snippet/component.js index cb8820a31..2cb208e04 100644 --- a/addon/components/docs-snippet/component.js +++ b/addon/components/docs-snippet/component.js @@ -1,3 +1,5 @@ +import classic from 'ember-classic-decorator'; +import { tagName, layout as templateLayout } from '@ember-decorators/component'; import Component from '@ember/component'; import layout from './template'; @@ -11,17 +13,17 @@ import layout from './template'; @class DocsSnippet @public */ -export default Component.extend({ - tagName: '', - layout, - +@classic +@tagName('') +@templateLayout(layout) +export default class DocsSnippet extends Component { /** The name of the snippet @argument name @type String? */ - name: null, + name = null; /** The language of the snippet @@ -29,7 +31,7 @@ export default Component.extend({ @argument language @type String? */ - language: null, + language = null; /** The title of the snippet @@ -37,7 +39,7 @@ export default Component.extend({ @argument title @type String? */ - title: null, + title = null; /** Whether or not to show the copy button for this snippet @@ -45,7 +47,7 @@ export default Component.extend({ @argument showCopy @type Boolean */ - showCopy: true, + showCopy = true; /** Whether or not the snippet should be unindented @@ -53,5 +55,5 @@ export default Component.extend({ @argument unindent @type Boolean */ - unindent: true, -}); + unindent = true; +} diff --git a/addon/components/docs-viewer/x-autogenerated-api-docs/component.js b/addon/components/docs-viewer/x-autogenerated-api-docs/component.js index c1186e872..2b938f618 100644 --- a/addon/components/docs-viewer/x-autogenerated-api-docs/component.js +++ b/addon/components/docs-viewer/x-autogenerated-api-docs/component.js @@ -1,16 +1,21 @@ -import Component from '@ember/component'; -import { inject as service } from '@ember/service'; +import classic from 'ember-classic-decorator'; +import { tagName, layout as templateLayout } from '@ember-decorators/component'; import { computed } from '@ember/object'; -import layout from './template'; +import { inject as service } from '@ember/service'; import { readOnly } from '@ember/object/computed'; +import Component from '@ember/component'; +import layout from './template'; import { set as _set } from 'lodash'; -export default Component.extend({ - layout, - tagName: '', - store: service(), +@classic +@templateLayout(layout) +@tagName('') +export default class XAutogeneratedApiDocs extends Component { + @service + store; - sections: readOnly('project.navigationIndex'), + @readOnly('project.navigationIndex') + sections; /* Autogenerated sections include "resolved types", by which we mean things like @@ -19,9 +24,10 @@ export default Component.extend({ These are the sections for the resolved types. */ - resolvedTypeSections: computed('sections', function() { + @computed('sections') + get resolvedTypeSections() { return this.sections.filter(section => section.type !== 'modules'); - }), + } /* Autogenerated sections include "resolved types", by which we mean things like @@ -57,7 +63,8 @@ export default Component.extend({ }; ``` */ - moduleIndex: computed('sections', function() { + @computed('sections') + get moduleIndex() { let modulesSection = this.sections.filter(section => section.type === 'modules')[0]; if (modulesSection) { @@ -101,6 +108,7 @@ export default Component.extend({ return transform(index)[0]; } - }) -}); + return null; + } +} diff --git a/addon/components/docs-viewer/x-autogenerated-api-docs/module-nav/component.js b/addon/components/docs-viewer/x-autogenerated-api-docs/module-nav/component.js index c2108740f..3da4a20de 100644 --- a/addon/components/docs-viewer/x-autogenerated-api-docs/module-nav/component.js +++ b/addon/components/docs-viewer/x-autogenerated-api-docs/module-nav/component.js @@ -1,10 +1,12 @@ +import classic from 'ember-classic-decorator'; +import { tagName, layout as templateLayout } from '@ember-decorators/component'; import Component from '@ember/component'; import layout from './template'; /* A component used to recursively render a nested structure of module nodes. */ -export default Component.extend({ - layout, - tagName: '' -}); +@classic +@templateLayout(layout) +@tagName('') +export default class ModuleNav extends Component {} diff --git a/addon/components/docs-viewer/x-current-page-index/component.js b/addon/components/docs-viewer/x-current-page-index/component.js index 0bbaca2a7..a59b462ec 100644 --- a/addon/components/docs-viewer/x-current-page-index/component.js +++ b/addon/components/docs-viewer/x-current-page-index/component.js @@ -1,10 +1,9 @@ +import classic from 'ember-classic-decorator'; +import { tagName, layout as templateLayout } from '@ember-decorators/component'; import Component from '@ember/component'; import layout from './template'; -export default Component.extend({ - - layout, - - tagName: '', - -}); +@classic +@templateLayout(layout) +@tagName('') +export default class XCurrentPageIndex extends Component {} diff --git a/addon/components/docs-viewer/x-main/component.js b/addon/components/docs-viewer/x-main/component.js index a7e73b11f..6c8ce82cc 100644 --- a/addon/components/docs-viewer/x-main/component.js +++ b/addon/components/docs-viewer/x-main/component.js @@ -1,7 +1,9 @@ -import Component from '@ember/component'; +import classic from 'ember-classic-decorator'; +import { classNames, tagName, layout as templateLayout } from '@ember-decorators/component'; +import { computed } from '@ember/object'; import { inject as service } from '@ember/service'; +import Component from '@ember/component'; import { bind } from '@ember/runloop'; -import { computed } from '@ember/object'; import appFiles from 'ember-cli-addon-docs/app-files'; import addonFiles from 'ember-cli-addon-docs/addon-files'; import config from 'ember-get-config'; @@ -14,20 +16,29 @@ const tagToIndent = { H2: '0', H3: '4' }; const tagToMarginTop = { H2: '2', H3: '2' }; const tagToMarginBottom = { H2: '0', H3: '0' }; -export default Component.extend({ - layout, - - router: service(), - docsRoutes: service(), - - tagName: 'main', - classNames: [ - 'docs-px-4', 'md:docs-px-8', 'lg:docs-px-20', 'docs-mx-auto', 'md:docs-mx-0', 'docs-mt-6', - 'md:docs-mt-12', 'md:docs-min-w-0', 'md:docs-flex-1' - ], +@classic +@templateLayout(layout) +@tagName('main') +@classNames( + 'docs-px-4', + 'md:docs-px-8', + 'lg:docs-px-20', + 'docs-mx-auto', + 'md:docs-mx-0', + 'docs-mt-6', + 'md:docs-mt-12', + 'md:docs-min-w-0', + 'md:docs-flex-1' +) +export default class XMain extends Component { + @service + router; + + @service + docsRoutes; didInsertElement() { - this._super(...arguments); + super.didInsertElement(...arguments); let target = this.element.querySelector('[data-current-page-index-target]') @@ -36,13 +47,13 @@ export default Component.extend({ this._mutationObserver.observe(target, { subtree: true, childList: true }); this.reindex(target); - }, + } willDestroyElement() { - this._super(...arguments); + super.willDestroyElement(...arguments); this._mutationObserver.disconnect(); - }, + } reindex(target) { let headers = Array.from( @@ -61,13 +72,14 @@ export default Component.extend({ }; }) ); - }, + } - editCurrentPageUrl: computed('router.currentRouteName', function() { + @computed('router.currentRouteName') + get editCurrentPageUrl() { let path = this.get('router.currentRouteName'); if (!path) { // `router` doesn't exist for old ember versions via ember-try - return; + return null; } let match = this._locateFile(path); @@ -82,7 +94,9 @@ export default Component.extend({ parts.push(match.file); return parts.filter(Boolean).join('/'); } - }), + + return null; + } _locateFile(path) { path = path.replace(/\./g, '/'); @@ -103,5 +117,4 @@ export default Component.extend({ } } } - -}); +} diff --git a/addon/components/docs-viewer/x-nav-list/component.js b/addon/components/docs-viewer/x-nav-list/component.js index fbcee4154..25793e112 100644 --- a/addon/components/docs-viewer/x-nav-list/component.js +++ b/addon/components/docs-viewer/x-nav-list/component.js @@ -1,12 +1,13 @@ +import classic from 'ember-classic-decorator'; +import { layout, tagName } from '@ember-decorators/component'; import Component from '@ember/component'; import { hbs } from 'ember-cli-htmlbars'; -export default Component.extend({ - tagName: 'ul', - - layout: hbs` - {{yield (hash - item=(component 'docs-viewer/x-nav-item') - )}} - ` -}); +@classic +@tagName('ul') +@layout(hbs` + {{yield (hash + item=(component 'docs-viewer/x-nav-item') + )}} +`) +export default class XNavList extends Component {} diff --git a/package.json b/package.json index 6ef582ddc..c04d003a2 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ }, "dependencies": { "@csstools/postcss-sass": "^4.0.0", - "@glimmer/syntax": "^0.69.0", + "@glimmer/syntax": "^0.69.1", "broccoli-bridge": "^1.0.0", "broccoli-caching-writer": "^3.0.3", "broccoli-debug": "^0.6.5", @@ -46,6 +46,7 @@ "chalk": "^4.1.0", "ember-angle-bracket-invocation-polyfill": "^3.0.0", "ember-auto-import": "^1.8.0", + "ember-classic-decorator": "^2.0.0", "ember-cli-autoprefixer": "^1.0.2", "ember-cli-babel": "^7.22.1", "ember-cli-clipboard": "^0.15.0", @@ -57,6 +58,7 @@ "ember-code-snippet": "^3.0.0", "ember-composable-helpers": "^4.4.1", "ember-concurrency": ">=0.9.0 <3", + "ember-decorators": "^6.1.1", "ember-fetch": "^8.0.2", "ember-get-config": "^0.3.0", "ember-href-to": "^4.0.0", diff --git a/yarn.lock b/yarn.lock index 45b8dc16b..e2b203885 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14,7 +14,7 @@ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.7.tgz#9329b4782a7d6bbd7eef57e11addf91ee3ef1e41" integrity sha512-YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw== -"@babel/core@^7.0.0", "@babel/core@^7.1.6", "@babel/core@^7.11.6", "@babel/core@^7.12.0", "@babel/core@^7.12.3", "@babel/core@^7.3.4": +"@babel/core@^7.0.0", "@babel/core@^7.1.6", "@babel/core@^7.11.6", "@babel/core@^7.12.0", "@babel/core@^7.12.3", "@babel/core@^7.3.4", "@babel/core@^7.8.7": version "7.12.10" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.10.tgz#b79a2e1b9f70ed3d84bbfb6d8c4ef825f606bccd" integrity sha512-eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w== @@ -246,7 +246,7 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.12.10", "@babel/parser@^7.12.3", "@babel/parser@^7.12.7", "@babel/parser@^7.4.5", "@babel/parser@^7.7.0": +"@babel/parser@^7.12.10", "@babel/parser@^7.12.3", "@babel/parser@^7.12.7", "@babel/parser@^7.4.5", "@babel/parser@^7.7.0", "@babel/parser@^7.8.7": version "7.12.10" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.10.tgz#824600d59e96aea26a5a2af5a9d812af05c3ae81" integrity sha512-PJdRPwyoOqFAWfLytxrWwGrAxghCgh/yTNCYciOz8QgjflA7aZhECPZAa2VUedKg2+QMWkI0L9lynh2SNmNEgA== @@ -872,7 +872,7 @@ "@babel/parser" "^7.12.7" "@babel/types" "^7.12.7" -"@babel/traverse@^7.1.6", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.10", "@babel/traverse@^7.12.5", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0": +"@babel/traverse@^7.1.6", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.10", "@babel/traverse@^7.12.5", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.8.6": version "7.12.10" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.10.tgz#2d1f4041e8bf42ea099e5b2dc48d6a594c00017a" integrity sha512-6aEtf0IeRgbYWzta29lePeYSk+YAFIC3kyqESeft8o5CkFlYIMX+EQDDWEiAQ9LHOA3d0oHdgrSsID/CKqXJlg== @@ -887,7 +887,7 @@ globals "^11.1.0" lodash "^4.17.19" -"@babel/types@^7.1.6", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.7.2": +"@babel/types@^7.1.6", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.7.2", "@babel/types@^7.8.7": version "7.12.10" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.10.tgz#7965e4a7260b26f09c56bcfcb0498af1f6d9b260" integrity sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw== @@ -1040,6 +1040,29 @@ ember-cli-typescript "^3.1.3" heimdalljs "^0.3.0" +"@ember-decorators/component@^6.1.1": + version "6.1.1" + resolved "https://registry.yarnpkg.com/@ember-decorators/component/-/component-6.1.1.tgz#b360dc4fa8e576ee1c840879399ef1745fd96e06" + integrity sha512-Cj8tY/c0MC/rsipqsiWLh3YVN72DK92edPYamD/HzvftwzC6oDwawWk8RmStiBnG9PG/vntAt41l3S7HSSA+1Q== + dependencies: + "@ember-decorators/utils" "^6.1.1" + ember-cli-babel "^7.1.3" + +"@ember-decorators/object@^6.1.1": + version "6.1.1" + resolved "https://registry.yarnpkg.com/@ember-decorators/object/-/object-6.1.1.tgz#50c922f5ac9af3ddd381cb6a43a031dfd9a70c7a" + integrity sha512-cb4CNR9sRoA31J3FCOFLDuR9ztM4wO9w1WlS4JeNRS7Z69SlB/XSXB/vplA3i9OOaXEy/zKWbu5ndZrHz0gvLw== + dependencies: + "@ember-decorators/utils" "^6.1.1" + ember-cli-babel "^7.1.3" + +"@ember-decorators/utils@^6.1.1": + version "6.1.1" + resolved "https://registry.yarnpkg.com/@ember-decorators/utils/-/utils-6.1.1.tgz#6b619814942b4fb3747cfa9f540c9f05283d7c5e" + integrity sha512-0KqnoeoLKb6AyoSU65TRF5T85wmS4uDn06oARddwNPxxf/lt5jQlh41uX3W7V/fWL9tPu8x1L1Vvpc80MN1+YA== + dependencies: + ember-cli-babel "^7.1.3" + "@ember/edition-utils@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@ember/edition-utils/-/edition-utils-1.2.0.tgz#a039f542dc14c8e8299c81cd5abba95e2459cfa6" @@ -1096,6 +1119,41 @@ ember-cli-version-checker "^5.1.1" semver "^7.3.2" +"@embroider/core@0.24.1": + version "0.24.1" + resolved "https://registry.yarnpkg.com/@embroider/core/-/core-0.24.1.tgz#bd214bed35fec5926844b3ba05528fe542942749" + integrity sha512-gIl2AMABIRmyuv34mqnjGQpaECeXgQJGR3D2TdmhUkeeMoxJtOGeoWMoEJQqU1m8REK+AoFM91gyemFBsa3HSw== + dependencies: + "@babel/core" "^7.8.7" + "@babel/parser" "^7.8.7" + "@babel/plugin-syntax-dynamic-import" "^7.8.3" + "@babel/traverse" "^7.8.6" + "@babel/types" "^7.8.7" + "@embroider/macros" "0.24.1" + assert-never "^1.1.0" + babel-plugin-syntax-dynamic-import "^6.18.0" + broccoli-persistent-filter "^2.2.2" + broccoli-plugin "^3.0.0" + broccoli-source "^1.1.0" + debug "^3.1.0" + fast-sourcemap-concat "^1.4.0" + filesize "^4.1.2" + fs-extra "^7.0.1" + fs-tree-diff "^2.0.0" + handlebars "^4.4.2" + js-string-escape "^1.0.1" + jsdom "^12.0.0" + json-stable-stringify "^1.0.1" + lodash "^4.17.10" + pkg-up "^2.0.0" + resolve "^1.8.1" + resolve-package-path "^1.2.2" + semver "^5.5.0" + strip-bom "^3.0.0" + typescript-memoize "^1.0.0-alpha.3" + walk-sync "^1.1.3" + wrap-legacy-hbs-plugin-if-needed "^1.0.1" + "@embroider/core@0.33.0", "@embroider/core@^0.33.0": version "0.33.0" resolved "https://registry.yarnpkg.com/@embroider/core/-/core-0.33.0.tgz#0fb1752d6e34ea45368e65c42e13220a57ffae76" @@ -1135,6 +1193,21 @@ walk-sync "^1.1.3" wrap-legacy-hbs-plugin-if-needed "^1.0.1" +"@embroider/macros@0.24.1", "@embroider/macros@^0.24.1": + version "0.24.1" + resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.24.1.tgz#0ab11b88d148f35c91f438f0b44f96fbf1607a9b" + integrity sha512-YMc8cioPitoeiphFQF6FdR5VdUzD+qRN4p1M8J9+vWafaXotpAcBMUZUxvbIABH1dkbh9FOcLfgrrzmePAM3sQ== + dependencies: + "@babel/core" "^7.8.7" + "@babel/traverse" "^7.8.6" + "@babel/types" "^7.8.7" + "@embroider/core" "0.24.1" + assert-never "^1.1.0" + ember-cli-babel "^7.20.5" + lodash "^4.17.10" + resolve "^1.8.1" + semver "^5.6.0" + "@embroider/macros@0.33.0": version "0.33.0" resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.33.0.tgz#d5826ea7565bb69b57ba81ed528315fe77acbf9d" @@ -1303,7 +1376,7 @@ "@handlebars/parser" "^1.1.0" simple-html-tokenizer "^0.5.10" -"@glimmer/syntax@^0.69.0": +"@glimmer/syntax@^0.69.1": version "0.69.1" resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.69.1.tgz#6571c8750e9483a9e5517bbbaaeab0323c8b855b" integrity sha512-LiLpqHCqdMz7puxtr8ozO5I3AFw9Eizxg8BlC75Ma/dxPwgvDQvHiUwD2VYX3Z3JrCghmZBtyPr+poimtWAhZA== @@ -2085,7 +2158,7 @@ abab@^1.0.0: resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e" integrity sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4= -abab@^2.0.3: +abab@^2.0.0, abab@^2.0.3: version "2.0.5" resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a" integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q== @@ -2122,6 +2195,14 @@ acorn-globals@^1.0.4: dependencies: acorn "^2.1.0" +acorn-globals@^4.3.0: + version "4.3.4" + resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.4.tgz#9fa1926addc11c97308c4e66d7add0d40c3272e7" + integrity sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A== + dependencies: + acorn "^6.0.1" + acorn-walk "^6.0.1" + acorn-globals@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45" @@ -2144,6 +2225,11 @@ acorn-node@^1.6.1: acorn-walk "^7.0.0" xtend "^4.0.2" +acorn-walk@^6.0.1: + version "6.2.0" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz#123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c" + integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA== + acorn-walk@^7.0.0, acorn-walk@^7.1.1: version "7.2.0" resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" @@ -2159,7 +2245,7 @@ acorn@^5.0.0, acorn@^5.5.3: resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e" integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg== -acorn@^6.4.1: +acorn@^6.0.1, acorn@^6.0.2, acorn@^6.4.1: version "6.4.2" resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ== @@ -2854,6 +2940,14 @@ babel-plugin-ember-modules-api-polyfill@^3.2.0: dependencies: ember-rfc176-data "^0.3.16" +babel-plugin-filter-imports@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/babel-plugin-filter-imports/-/babel-plugin-filter-imports-3.0.0.tgz#a849683837ad29960da17492fb32789ab6b09a11" + integrity sha512-p/chjzVTgCxUqyLM0q/pfWVZS7IJTwGQMwNg0LOvuQpKiTftQgZDtkGB8XvETnUw19rRcL7bJCTopSwibTN2tA== + dependencies: + "@babel/types" "^7.4.0" + lodash "^4.17.11" + babel-plugin-filter-imports@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/babel-plugin-filter-imports/-/babel-plugin-filter-imports-4.0.0.tgz#068f8da15236a96a9602c36dc6f4a6eeca70a4f4" @@ -3917,7 +4011,7 @@ broccoli-persistent-filter@^1.1.5, broccoli-persistent-filter@^1.1.6, broccoli-p symlink-or-copy "^1.0.1" walk-sync "^0.3.1" -broccoli-persistent-filter@^2.1.1, broccoli-persistent-filter@^2.2.1, broccoli-persistent-filter@^2.3.0, broccoli-persistent-filter@^2.3.1: +broccoli-persistent-filter@^2.1.1, broccoli-persistent-filter@^2.2.1, broccoli-persistent-filter@^2.2.2, broccoli-persistent-filter@^2.3.0, broccoli-persistent-filter@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-2.3.1.tgz#4a052e0e0868b344c3a2977e35a3d497aa9eca72" integrity sha512-hVsmIgCDrl2NFM+3Gs4Cr2TA6UPaIZip99hN8mtkaUPgM8UeVnCbxelCvBjUBHo0oaaqP5jzqqnRVvb568Yu5g== @@ -3997,7 +4091,7 @@ broccoli-plugin@^2.0.0, broccoli-plugin@^2.1.0: rimraf "^2.3.4" symlink-or-copy "^1.1.8" -broccoli-plugin@^3.1.0: +broccoli-plugin@^3.0.0, broccoli-plugin@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-3.1.0.tgz#54ba6dd90a42ec3db5624063292610e326b1e542" integrity sha512-7w7FP8WJYjLvb0eaw27LO678TGGaom++49O1VYIuzjhXjK5kn2+AMlDm7CaUFw4F7CLGoVQeZ84d8gICMJa4lA== @@ -5455,7 +5549,7 @@ csso@^3.5.1: dependencies: css-tree "1.0.0-alpha.29" -cssom@0.3.x, "cssom@>= 0.3.0 < 0.4.0", cssom@~0.3.6: +cssom@0.3.x, "cssom@>= 0.3.0 < 0.4.0", cssom@^0.3.4, cssom@~0.3.6: version "0.3.8" resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a" integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg== @@ -5472,6 +5566,13 @@ cssom@^0.4.4: dependencies: cssom "0.3.x" +cssstyle@^1.1.1: + version "1.4.0" + resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.4.0.tgz#9d31328229d3c565c61e586b02041a28fccdccf1" + integrity sha512-GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA== + dependencies: + cssom "0.3.x" + cssstyle@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852" @@ -5501,6 +5602,15 @@ dashdash@^1.12.0: dependencies: assert-plus "^1.0.0" +data-urls@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-1.1.0.tgz#15ee0582baa5e22bb59c77140da8f9c76963bbfe" + integrity sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ== + dependencies: + abab "^2.0.0" + whatwg-mimetype "^2.2.0" + whatwg-url "^7.0.0" + data-urls@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b" @@ -5814,6 +5924,13 @@ domelementtype@^2.0.1: resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.1.0.tgz#a851c080a6d1c3d94344aed151d99f669edf585e" integrity sha512-LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w== +domexception@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90" + integrity sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug== + dependencies: + webidl-conversions "^4.0.2" + domexception@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304" @@ -6002,6 +6119,15 @@ ember-auto-import@^1.2.19, ember-auto-import@^1.5.3, ember-auto-import@^1.8.0: walk-sync "^0.3.3" webpack "^4.43.0" +ember-classic-decorator@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ember-classic-decorator/-/ember-classic-decorator-2.0.0.tgz#e781e0811a92524ad177b490f404f513794aee39" + integrity sha512-XBwM2XQC1Z1InIyfflZRmBpZ8+aVTNtHGdTmpjUH8Fpw1t2jmGmEIz2i5mTREebhLSwYC5TPYGOGw+2++fKqZg== + dependencies: + "@embroider/macros" "^0.24.1" + babel-plugin-filter-imports "^3.0.0" + ember-cli-babel "^7.11.1" + ember-classy-page-object@^0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/ember-classy-page-object/-/ember-classy-page-object-0.6.1.tgz#f170b2f69f646ab406ff982874a2ab926af9294a" @@ -6689,6 +6815,15 @@ ember-data@~3.23.0: ember-cli-typescript "^3.1.3" ember-inflector "^3.0.1" +ember-decorators@^6.1.1: + version "6.1.1" + resolved "https://registry.yarnpkg.com/ember-decorators/-/ember-decorators-6.1.1.tgz#6d770f8999cf5a413a1ee459afd520838c0fc470" + integrity sha512-63vZPntPn1aqMyeNRLoYjJD+8A8obd+c2iZkJflswpDRNVIsp2m7aQdSCtPt4G0U/TEq2251g+N10maHX3rnJQ== + dependencies: + "@ember-decorators/component" "^6.1.1" + "@ember-decorators/object" "^6.1.1" + ember-cli-babel "^7.7.3" + ember-destroyable-polyfill@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/ember-destroyable-polyfill/-/ember-destroyable-polyfill-2.0.2.tgz#2cc7532bd3c00e351b4da9b7fc683f4daff79671" @@ -7342,7 +7477,7 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= -escodegen@^1.14.1, escodegen@^1.6.1: +escodegen@^1.11.0, escodegen@^1.14.1, escodegen@^1.6.1: version "1.14.3" resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503" integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw== @@ -8997,6 +9132,13 @@ hosted-git-info@^3.0.4, hosted-git-info@^3.0.6: dependencies: lru-cache "^6.0.0" +html-encoding-sniffer@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz#e70d84b94da53aa375e11fe3a351be6642ca46f8" + integrity sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw== + dependencies: + whatwg-encoding "^1.0.1" + html-encoding-sniffer@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3" @@ -9845,6 +9987,37 @@ jsbn@~0.1.0: resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= +jsdom@^12.0.0: + version "12.2.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-12.2.0.tgz#7cf3f5b5eafd47f8f09ca52315d367ff6e95de23" + integrity sha512-QPOggIJ8fquWPLaYYMoh+zqUmdphDtu1ju0QGTitZT1Yd8I5qenPpXM1etzUegu3MjVp8XPzgZxdn8Yj7e40ig== + dependencies: + abab "^2.0.0" + acorn "^6.0.2" + acorn-globals "^4.3.0" + array-equal "^1.0.0" + cssom "^0.3.4" + cssstyle "^1.1.1" + data-urls "^1.0.1" + domexception "^1.0.1" + escodegen "^1.11.0" + html-encoding-sniffer "^1.0.2" + nwsapi "^2.0.9" + parse5 "5.1.0" + pn "^1.1.0" + request "^2.88.0" + request-promise-native "^1.0.5" + saxes "^3.1.3" + symbol-tree "^3.2.2" + tough-cookie "^2.4.3" + w3c-hr-time "^1.0.1" + webidl-conversions "^4.0.2" + whatwg-encoding "^1.0.5" + whatwg-mimetype "^2.2.0" + whatwg-url "^7.0.0" + ws "^6.1.0" + xml-name-validator "^3.0.0" + jsdom@^16.4.0: version "16.4.0" resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.4.0.tgz#36005bde2d136f73eee1a830c6d45e55408edddb" @@ -10568,7 +10741,7 @@ lodash.values@^4.3.0: resolved "https://registry.yarnpkg.com/lodash.values/-/lodash.values-4.3.0.tgz#a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347" integrity sha1-o6bCsOvsxcLLocF+bmIP6BtT00c= -lodash@4.17.20, lodash@^4.0.0, lodash@^4.1.0, lodash@^4.16.1, lodash@^4.17.10, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.5.1, lodash@^4.6.1: +lodash@4.17.20, lodash@^4.0.0, lodash@^4.1.0, lodash@^4.16.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.5.1, lodash@^4.6.1: version "4.17.20" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== @@ -11565,7 +11738,7 @@ number-is-nan@^1.0.0: resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.4.tgz#2285631f34a95f0d0395cd900c96ed39b58f346e" integrity sha512-3iuY4N5dhgMpCUrOVnuAdGrgxVqV2cJpM+XNccjR2DKOB1RUP0aA+wGXEiNziG/UKboFyGBIoKOaNlJxx8bciQ== -nwsapi@^2.2.0: +nwsapi@^2.0.9, nwsapi@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7" integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ== @@ -12009,6 +12182,11 @@ parse5-htmlparser2-tree-adapter@^6.0.0: dependencies: parse5 "^6.0.1" +parse5@5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.0.tgz#c59341c9723f414c452975564c7c00a68d58acd2" + integrity sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ== + parse5@5.1.1, parse5@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178" @@ -12218,6 +12396,11 @@ pkg-up@^3.1.0: dependencies: find-up "^3.0.0" +pn@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb" + integrity sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA== + portfinder@^1.0.26: version "1.0.28" resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778" @@ -13010,7 +13193,7 @@ request-promise-core@1.1.4: dependencies: lodash "^4.17.19" -request-promise-native@^1.0.8: +request-promise-native@^1.0.5, request-promise-native@^1.0.8: version "1.0.9" resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz#e407120526a5efdc9a39b28a5679bf47b9d9dc28" integrity sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g== @@ -13019,7 +13202,7 @@ request-promise-native@^1.0.8: stealthy-require "^1.1.1" tough-cookie "^2.3.3" -request@^2.55.0, request@^2.88.2: +request@^2.55.0, request@^2.88.0, request@^2.88.2: version "2.88.2" resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== @@ -13373,6 +13556,13 @@ sax@^1.1.4, sax@~1.2.4: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== +saxes@^3.1.3: + version "3.1.11" + resolved "https://registry.yarnpkg.com/saxes/-/saxes-3.1.11.tgz#d59d1fd332ec92ad98a2e0b2ee644702384b1c5b" + integrity sha512-Ydydq3zC+WYDJK1+gRxRapLIED9PWeSuuS41wqyoRmzvhhh9nc+QQrVMKJYzJFULazeGhzSV0QleN2wD3boh2g== + dependencies: + xmlchars "^2.1.1" + saxes@^5.0.0: version "5.0.1" resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d" @@ -14201,7 +14391,7 @@ svgo@1.3.0: unquote "~1.1.1" util.promisify "~1.0.0" -"symbol-tree@>= 3.1.0 < 4.0.0", symbol-tree@^3.2.4: +"symbol-tree@>= 3.1.0 < 4.0.0", symbol-tree@^3.2.2, symbol-tree@^3.2.4: version "3.2.4" resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== @@ -14611,7 +14801,7 @@ topo@2.x.x: dependencies: hoek "4.x.x" -tough-cookie@>=0.12.0, tough-cookie@^2.2.0, tough-cookie@^2.3.3, tough-cookie@^3.0.1, tough-cookie@~2.4.0, tough-cookie@~2.5.0: +tough-cookie@>=0.12.0, tough-cookie@^2.2.0, tough-cookie@^2.3.3, tough-cookie@^2.4.3, tough-cookie@^3.0.1, tough-cookie@~2.4.0, tough-cookie@~2.5.0: 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== @@ -14619,6 +14809,13 @@ tough-cookie@>=0.12.0, tough-cookie@^2.2.0, tough-cookie@^2.3.3, tough-cookie@^3 psl "^1.1.24" punycode "^1.4.1" +tr46@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09" + integrity sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk= + dependencies: + punycode "^2.1.0" + tr46@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz#03273586def1595ae08fedb38d7733cee91d2479" @@ -15081,7 +15278,7 @@ vm-browserify@^1.0.1: resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== -w3c-hr-time@^1.0.2: +w3c-hr-time@^1.0.1, w3c-hr-time@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ== @@ -15177,6 +15374,11 @@ webidl-conversions@^2.0.0: resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-2.0.1.tgz#3bf8258f7d318c7443c36f2e169402a1a6703506" integrity sha1-O/glj30xjHRDw28uFpQCoaZwNQY= +webidl-conversions@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad" + integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg== + webidl-conversions@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff" @@ -15238,7 +15440,7 @@ websocket-extensions@>=0.1.1: resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg== -whatwg-encoding@^1.0.5: +whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0" integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw== @@ -15250,7 +15452,7 @@ whatwg-fetch@^3.4.0: resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.5.0.tgz#605a2cd0a7146e5db141e29d1c62ab84c0c4c868" integrity sha512-jXkLtsR42xhXg7akoDKvKWE40eJeI+2KZqcp2h3NsOrRnDvtWX36KcKl30dy+hxECivdk2BVUHVNrPtoMBUx6A== -whatwg-mimetype@^2.3.0: +whatwg-mimetype@^2.2.0, whatwg-mimetype@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== @@ -15262,6 +15464,15 @@ whatwg-url-compat@~0.6.5: dependencies: tr46 "~0.0.1" +whatwg-url@^7.0.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz#c2c492f1eca612988efd3d2266be1b9fc6170d06" + integrity sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg== + dependencies: + lodash.sortby "^4.7.0" + tr46 "^1.0.1" + webidl-conversions "^4.0.2" + whatwg-url@^8.0.0: version "8.4.0" resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.4.0.tgz#50fb9615b05469591d2b2bd6dfaed2942ed72837" @@ -15411,6 +15622,13 @@ write-file-atomic@^3.0.0: signal-exit "^3.0.2" typedarray-to-buffer "^3.1.5" +ws@^6.1.0: + version "6.2.1" + resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb" + integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA== + dependencies: + async-limiter "~1.0.0" + ws@^7.1.2, ws@^7.2.3: version "7.4.1" resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.1.tgz#a333be02696bd0e54cea0434e21dcc8a9ac294bb" @@ -15438,7 +15656,7 @@ xml-name-validator@^3.0.0: resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a" integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw== -xmlchars@^2.2.0: +xmlchars@^2.1.1, xmlchars@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==