diff --git a/.circleci/config.yml b/.circleci/config.yml index eed80d6645..883859f81f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -42,7 +42,11 @@ commands: - restore_cache: name: Restore Golden Images Cache keys: +<<<<<<< HEAD - v1-golden-images-<< parameters.regression_color >>-<< parameters.regression_scale >>-2f4e2d334e9b2dc2bd8b3415e3ab66022cbb7af0 +======= + - v1-golden-images-<< parameters.regression_color >>-<< parameters.regression_scale >>-fc273cb7681bbcf9711b73279b1fe88e6308443b +>>>>>>> feat(rule): add Spectrum rule pattern and apply to docs - v1-golden-images-master-<< parameters.regression_color >>-<< parameters.regression_scale >>- - run: yarn test:visual:ci --color=<< parameters.regression_color >> --scale=<< parameters.regression_scale >> - run: diff --git a/documentation/src/components/home.ts b/documentation/src/components/home.ts index 1a3023524d..63241689f5 100644 --- a/documentation/src/components/home.ts +++ b/documentation/src/components/home.ts @@ -4,6 +4,7 @@ import componentStyles from './markdown.css'; import homeStyles from './home.css'; import '@spectrum-web-components/button'; import '@spectrum-web-components/link'; +import '@spectrum-web-components/rule'; class HomeElement extends RouteComponent { public static get styles(): CSSResultArray { @@ -75,10 +76,13 @@ class HomeElement extends RouteComponent {

-
-

- Sample element usage -

+
+
+

+ Sample element usage +

+ +
<sp-button variant='cta' href='components/button'>Use Spectrum Web Component buttons</sp-button> diff --git a/documentation/src/components/markdown.css b/documentation/src/components/markdown.css index 3b8b0bf584..bd0a9143ba 100644 --- a/documentation/src/components/markdown.css +++ b/documentation/src/components/markdown.css @@ -36,10 +36,6 @@ governing permissions and limitations under the License. margin-bottom: 28px; } -hr.spectrum-Rule { - margin-bottom: 33px; -} - article { margin-bottom: 3em; } @@ -51,3 +47,7 @@ article { .spectrum-Table-body { --spectrum-table-row-background-color: var(--spectrum-global-color-gray-75); } + +.headerContainer { + margin-bottom: var(--spectrum-global-dimension-size-400); +} diff --git a/documentation/src/utils/posthtml-spectrum-typography.js b/documentation/src/utils/posthtml-spectrum-typography.js index bdcda07245..94380bc9e4 100644 --- a/documentation/src/utils/posthtml-spectrum-typography.js +++ b/documentation/src/utils/posthtml-spectrum-typography.js @@ -47,7 +47,32 @@ const transformations = [ }, { selector: 'h2', - classes: ['spectrum-Heading2--quiet'], + fn: (node) => { + if ( + node.attrs && + node.attrs.class && + /spectrum-Heading2/.test(node.attrs.class) + ) { + return node; + } + return { + tag: 'div', + attrs: { + class: 'headerContainer', + }, + content: [ + { + tag: 'h1', + attrs: { class: 'spectrum-Heading2' }, + content: node.content, + }, + { + tag: 'sp-rule', + attrs: { size: 'large' }, + }, + ], + }; + }, }, { selector: 'h3', diff --git a/package.json b/package.json index 40fceab7ee..c250f0d9a6 100644 --- a/package.json +++ b/package.json @@ -194,9 +194,8 @@ "postcss-selector-parser": "^6.0.2", "posthtml": "^0.12.0", "posthtml-attrs-parser": "^0.1.1", - "posthtml-loader": "^1.0.1", + "posthtml-loader": "^1.0.2", "posthtml-match-helper": "^1.0.1", - "posthtml-transform": "^1.0.6", "prettier": "^2.0.2", "pretty-quick": "^2.0.1", "prismjs": "^1.15.0", diff --git a/packages/bundle/package.json b/packages/bundle/package.json index 5bba32db9b..9abfbe5d5c 100644 --- a/packages/bundle/package.json +++ b/packages/bundle/package.json @@ -67,6 +67,7 @@ "@spectrum-web-components/popover": "^0.3.6", "@spectrum-web-components/radio": "^0.2.10", "@spectrum-web-components/radio-group": "^0.1.16", + "@spectrum-web-components/rule": "^0.0.1", "@spectrum-web-components/search": "^0.2.12", "@spectrum-web-components/sidenav": "^0.3.6", "@spectrum-web-components/slider": "^0.4.7", diff --git a/packages/bundle/src/index.ts b/packages/bundle/src/index.ts index 48f9e45c9c..78a7d7a00c 100644 --- a/packages/bundle/src/index.ts +++ b/packages/bundle/src/index.ts @@ -35,6 +35,7 @@ export * from '@spectrum-web-components/overlay'; export * from '@spectrum-web-components/popover'; export * from '@spectrum-web-components/radio'; export * from '@spectrum-web-components/radio-group'; +export * from '@spectrum-web-components/rule'; export * from '@spectrum-web-components/search'; export * from '@spectrum-web-components/sidenav'; export * from '@spectrum-web-components/slider'; diff --git a/packages/bundle/tsconfig.json b/packages/bundle/tsconfig.json index 3f8770aa7c..2d924b432e 100644 --- a/packages/bundle/tsconfig.json +++ b/packages/bundle/tsconfig.json @@ -32,6 +32,7 @@ { "path": "../overlay" }, { "path": "../radio" }, { "path": "../radio-group" }, + { "path": "../rule" }, { "path": "../search" }, { "path": "../sidenav" }, { "path": "../slider" }, diff --git a/packages/rule/README.md b/packages/rule/README.md new file mode 100644 index 0000000000..a2cc2a17a5 --- /dev/null +++ b/packages/rule/README.md @@ -0,0 +1,72 @@ +## Description + +`sp-rule` bring clarity to a layout by grouping and dividing content in close proximity. They can also be used to establish rhythm and hierarchy. + +### Installation + +[![See it on NPM!](https://img.shields.io/npm/v/@spectrum-web-components/rule?style=for-the-badge)](https://www.npmjs.com/package/@spectrum-web-components/rule) +[![How big is this package in your project?](https://img.shields.io/bundlephobia/minzip/@spectrum-web-components/rule?style=for-the-badge)](https://bundlephobia.com/result?p=@spectrum-web-components/rule) + +``` +npm install @spectrum-web-components/rule + +# or + +yarn add @spectrum-web-components/rule +``` + +## Examples + +### Large + +```html-live +

Large

+ +

Page or Section Titles.

+``` + +### Medium + +```html-live +

Medium

+ +

Divide subsections, or divide different groups of elements (between panels, rails, etc.)

+``` + +### Small + +```html-live +

Small

+ +

Divide like-elements (tables, tool groups, elements within a panel, etc.)

+``` + +### Vertical, Small + +When a vertical Rule is used inside of a flex container, use `align-self: stretch; height: auto;` on the Rule. + +```html-live +
+ + + + + + + +
+``` + +### Vertical, Medium + +```html-live +
+ + + + + + + +
+``` diff --git a/packages/rule/package.json b/packages/rule/package.json new file mode 100644 index 0000000000..1f63d14543 --- /dev/null +++ b/packages/rule/package.json @@ -0,0 +1,46 @@ +{ + "name": "@spectrum-web-components/rule", + "publishConfig": { + "access": "public" + }, + "repository": { + "type": "git", + "url": "https://github.com/adobe/spectrum-web-components.git", + "directory": "packages/rule" + }, + "bugs": { + "url": "https://github.com/adobe/spectrum-web-components/issues" + }, + "homepage": "https://adobe.github.io/spectrum-web-components/components/rule", + "keywords": [ + "spectrum css", + "web components", + "lit-element", + "lit-html" + ], + "version": "0.0.1", + "description": "", + "main": "lib/index.js", + "module": "lib/index.js", + "type": "module", + "files": [ + "custom-elements.json", + "/lib/", + "/src/" + ], + "scripts": { + "test": "karma start --coverage" + }, + "author": "", + "license": "Apache-2.0", + "peerDependencies": { + "lit-element": "^2.1.0", + "lit-html": "^1.0.0" + }, + "devDependencies": { + "@spectrum-css/rule": "^2.0.0" + }, + "dependencies": { + "tslib": "^1.10.0" + } +} diff --git a/packages/rule/src/index.ts b/packages/rule/src/index.ts new file mode 100644 index 0000000000..9fa9310b19 --- /dev/null +++ b/packages/rule/src/index.ts @@ -0,0 +1,26 @@ +/* +Copyright 2020 Adobe. All rights reserved. +This file is licensed to you under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. You may obtain a copy +of the License at http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software distributed under +the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS +OF ANY KIND, either express or implied. See the License for the specific language +governing permissions and limitations under the License. +*/ + +export * from './rule.js'; + +import { Rule } from './rule.js'; + +/* istanbul ignore else */ +if (!customElements.get('sp-rule')) { + customElements.define('sp-rule', Rule); +} + +declare global { + interface HTMLElementTagNameMap { + 'sp-rule': Rule; + } +} diff --git a/packages/rule/src/rule.css b/packages/rule/src/rule.css new file mode 100644 index 0000000000..c864705273 --- /dev/null +++ b/packages/rule/src/rule.css @@ -0,0 +1,22 @@ +/* +Copyright 2020 Adobe. All rights reserved. +This file is licensed to you under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. You may obtain a copy +of the License at http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software distributed under +the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS +OF ANY KIND, either express or implied. See the License for the specific language +governing permissions and limitations under the License. +*/ + +@import './spectrum-rule.css'; + +:host { + display: block; +} + +hr { + border: none; + margin: 0; +} diff --git a/packages/rule/src/rule.ts b/packages/rule/src/rule.ts new file mode 100644 index 0000000000..d1ec00f316 --- /dev/null +++ b/packages/rule/src/rule.ts @@ -0,0 +1,38 @@ +/* +Copyright 2020 Adobe. All rights reserved. +This file is licensed to you under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. You may obtain a copy +of the License at http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software distributed under +the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS +OF ANY KIND, either express or implied. See the License for the specific language +governing permissions and limitations under the License. +*/ + +import { + html, + LitElement, + CSSResultArray, + TemplateResult, + property, +} from 'lit-element'; + +import styles from './rule.css'; + +/** + * @element sp-rule + */ +export class Rule extends LitElement { + public static styles: CSSResultArray = [styles]; + + @property({ type: Boolean, reflect: true }) + public vertical = false; + + protected render(): TemplateResult { + if (this.vertical) return html``; + return html` +
+ `; + } +} diff --git a/packages/rule/src/spectrum-config.js b/packages/rule/src/spectrum-config.js new file mode 100644 index 0000000000..5a0db35be6 --- /dev/null +++ b/packages/rule/src/spectrum-config.js @@ -0,0 +1,39 @@ +/* +Copyright 2020 Adobe. All rights reserved. +This file is licensed to you under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. You may obtain a copy +of the License at http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software distributed under +the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS +OF ANY KIND, either express or implied. See the License for the specific language +governing permissions and limitations under the License. +*/ + +module.exports = { + spectrum: 'rule', + components: [ + { + name: 'rule', + host: { + selector: '.spectrum-Rule', + }, + attributes: [ + { + selector: '.spectrum-Rule--vertical', + type: 'boolean', + name: 'vertical', + }, + { + type: 'enum', + name: 'size', + values: [ + '.spectrum-Rule--small', + '.spectrum-Rule--medium', + '.spectrum-Rule--large', + ], + }, + ], + }, + ], +}; diff --git a/packages/rule/src/spectrum-rule.css b/packages/rule/src/spectrum-rule.css new file mode 100644 index 0000000000..15f07896ba --- /dev/null +++ b/packages/rule/src/spectrum-rule.css @@ -0,0 +1,96 @@ +/* stylelint-disable */ /* +Copyright 2020 Adobe. All rights reserved. +This file is licensed to you under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. You may obtain a copy +of the License at http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software distributed under +the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS +OF ANY KIND, either express or implied. See the License for the specific language +governing permissions and limitations under the License. + +THIS FILE IS MACHINE GENERATED. DO NOT EDIT */ +:host { + /* .spectrum-Rule */ + width: 100%; + overflow: visible; + border: none; + border-width: var( + --spectrum-divider-medium-height, + var(--spectrum-global-dimension-static-size-25) + ); + border-radius: var( + --spectrum-divider-medium-height, + var(--spectrum-global-dimension-static-size-25) + ); +} +:host([size='large']) { + /* .spectrum-Rule--large */ + height: var( + --spectrum-divider-large-height, + var(--spectrum-global-dimension-static-size-50) + ); + border-radius: var( + --spectrum-divider-large-border-radius, + var(--spectrum-global-dimension-static-size-25) + ); /* .spectrum-Rule--large */ + background-color: var( + --spectrum-rule-large-background-color, + var(--spectrum-global-color-gray-800) + ); +} +:host([size='medium']) { + /* .spectrum-Rule--medium */ + height: var( + --spectrum-divider-medium-height, + var(--spectrum-global-dimension-static-size-25) + ); + border-radius: var( + --spectrum-divider-medium-border-radius, + var(--spectrum-global-dimension-static-size-10) + ); /* .spectrum-Rule--medium */ + background-color: var( + --spectrum-rule-medium-background-color, + var(--spectrum-global-color-gray-300) + ); +} +:host([size='small']) { + /* .spectrum-Rule--small */ + height: var( + --spectrum-divider-small-height, + var(--spectrum-global-dimension-static-size-10) + ); + border-radius: var( + --spectrum-divider-small-border-radius, + var(--spectrum-global-dimension-static-size-10) + ); /* .spectrum-Rule--small */ + background-color: var( + --spectrum-rule-small-background-color, + var(--spectrum-global-color-gray-300) + ); +} +:host([vertical]) { + /* .spectrum-Rule--vertical */ + height: 100%; +} +:host([vertical][size='large']) { + /* .spectrum-Rule--vertical.spectrum-Rule--large */ + width: var( + --spectrum-divider-large-vertical-width, + var(--spectrum-global-dimension-static-size-50) + ); +} +:host([vertical][size='medium']) { + /* .spectrum-Rule--vertical.spectrum-Rule--medium */ + width: var( + --spectrum-divider-medium-vertical-width, + var(--spectrum-global-dimension-static-size-25) + ); +} +:host([vertical][size='small']) { + /* .spectrum-Rule--vertical.spectrum-Rule--small */ + width: var( + --spectrum-divider-small-veritcal-width, + var(--spectrum-global-dimension-static-size-10) + ); +} diff --git a/packages/rule/stories/rule.stories.ts b/packages/rule/stories/rule.stories.ts new file mode 100644 index 0000000000..5f61fdda79 --- /dev/null +++ b/packages/rule/stories/rule.stories.ts @@ -0,0 +1,118 @@ +/* +Copyright 2020 Adobe. All rights reserved. +This file is licensed to you under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. You may obtain a copy +of the License at http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software distributed under +the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS +OF ANY KIND, either express or implied. See the License for the specific language +governing permissions and limitations under the License. +*/ + +import { html, select } from '@open-wc/demoing-storybook'; +import { TemplateResult } from 'lit-element'; + +import '../'; +import './typography-decorator.js'; +import '@spectrum-web-components/button'; +import '@spectrum-web-components/icon'; +import { + AlignLeftIcon, + AlignRightIcon, +} from '@spectrum-web-components/icons-workflow'; + +export default { + title: 'Rule', + decorators: [ + (story): TemplateResult => html` + + `, + ], +}; + +export const large = (): TemplateResult => { + const size = select( + 'Size', + ['small', 'medium', 'large'], + 'large', + 'Element' + ); + return html` +

Large

+ +

Page or Section Titles.

+ `; +}; + +export const medium = (): TemplateResult => { + const size = select( + 'Size', + ['small', 'medium', 'large'], + 'medium', + 'Element' + ); + return html` +

Medium

+ +

+ Divide subsections, or divide different groups of elements (between + panels, rails, etc.) +

+ `; +}; + +export const small = (): TemplateResult => { + const size = select( + 'Size', + ['small', 'medium', 'large'], + 'small', + 'Element' + ); + return html` +

Small

+ +

+ Divide like-elements (tables, tool groups, elements within a panel, + etc.) +

+ `; +}; + +export const verticalSmall = (): TemplateResult => { + const size = select('Size', ['small', 'medium'], 'small', 'Element'); + return html` +
+ + + ${AlignLeftIcon()} + + + + + + ${AlignRightIcon()} + + +
+ `; +}; + +export const verticalMedium = (): TemplateResult => { + const size = select('Size', ['small', 'medium'], 'medium', 'Element'); + return html` +
+ + + ${AlignLeftIcon()} + + + + + + ${AlignRightIcon()} + + +
+ `; +}; diff --git a/packages/rule/stories/typography-decorator.ts b/packages/rule/stories/typography-decorator.ts new file mode 100644 index 0000000000..8975449b8a --- /dev/null +++ b/packages/rule/stories/typography-decorator.ts @@ -0,0 +1,42 @@ +/* +Copyright 2020 Adobe. All rights reserved. +This file is licensed to you under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. You may obtain a copy +of the License at http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software distributed under +the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS +OF ANY KIND, either express or implied. See the License for the specific language +governing permissions and limitations under the License. +*/ + +import { + html, + LitElement, + CSSResultArray, + TemplateResult, + property, + customElement, +} from 'lit-element'; + +import styles from '@spectrum-web-components/theme/lib/typography.css.js'; + +/** + * @element typography-decorator + */ +@customElement('typography-decorator') +export class Typography extends LitElement { + static styles: CSSResultArray = [styles]; + + @property({ attribute: false }) + public story?: TemplateResult; + + protected render(): TemplateResult { + if (!this.story) return html``; + return html` +
+ ${this.story} +
+ `; + } +} diff --git a/packages/rule/test/benchmark/basic-test.ts b/packages/rule/test/benchmark/basic-test.ts new file mode 100644 index 0000000000..210cef83b8 --- /dev/null +++ b/packages/rule/test/benchmark/basic-test.ts @@ -0,0 +1,19 @@ +/* +Copyright 2020 Adobe. All rights reserved. +This file is licensed to you under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. You may obtain a copy +of the License at http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software distributed under +the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS +OF ANY KIND, either express or implied. See the License for the specific language +governing permissions and limitations under the License. +*/ + +import '../../'; +import { html } from 'lit-html'; +import { measureFixtureCreation } from '../../../../test/benchmark/helpers'; + +measureFixtureCreation(html` + +`); diff --git a/packages/rule/test/rule.test.ts b/packages/rule/test/rule.test.ts new file mode 100644 index 0000000000..ebd7db5c0a --- /dev/null +++ b/packages/rule/test/rule.test.ts @@ -0,0 +1,31 @@ +/* +Copyright 2020 Adobe. All rights reserved. +This file is licensed to you under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. You may obtain a copy +of the License at http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software distributed under +the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS +OF ANY KIND, either express or implied. See the License for the specific language +governing permissions and limitations under the License. +*/ + +import { html } from 'lit-element'; +import { fixture, elementUpdated, expect } from '@open-wc/testing'; + +import '..'; +import { Rule } from '..'; + +describe('Rule', () => { + it('loads default rule accessibly', async () => { + const el = await fixture( + html` + + ` + ); + + await elementUpdated(el); + + expect(el).to.be.accessible(); + }); +}); diff --git a/packages/rule/tsconfig.json b/packages/rule/tsconfig.json new file mode 100644 index 0000000000..0ba9bb6124 --- /dev/null +++ b/packages/rule/tsconfig.json @@ -0,0 +1,9 @@ +{ + "extends": "../../tsconfig.json", + "compilerOptions": { + "composite": true, + "outDir": "./lib", + "rootDir": "./src" + }, + "include": ["src/*.ts"] +} diff --git a/packages/theme/src/typography.css b/packages/theme/src/typography.css new file mode 100644 index 0000000000..b5a66b5f71 --- /dev/null +++ b/packages/theme/src/typography.css @@ -0,0 +1,13 @@ +/* +Copyright 2020 Adobe. All rights reserved. +This file is licensed to you under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. You may obtain a copy +of the License at http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software distributed under +the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS +OF ANY KIND, either express or implied. See the License for the specific language +governing permissions and limitations under the License. +*/ + +@import '@spectrum-web-components/styles/typography.css'; diff --git a/test/visual/stories.js b/test/visual/stories.js index 90e6e177e6..dbd99f1b22 100644 --- a/test/visual/stories.js +++ b/test/visual/stories.js @@ -88,6 +88,11 @@ module.exports = [ 'radio--label-below-checked', 'radio--group-example', 'radio--tab-index-example', + 'rule--large', + 'rule--medium', + 'rule--small', + 'rule--vertical-small', + 'rule--vertical-medium', 'search--default', 'search--quiet', 'sidenav--default', diff --git a/yarn.lock b/yarn.lock index 28b0bd5d3c..a204005901 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2663,7 +2663,7 @@ resolved "https://registry.yarnpkg.com/@spectrum-css/radio/-/radio-2.1.0.tgz#7432d0a9d8e7bdf5e1970c787ec97faf87062df7" integrity sha512-FuCnFu8qOZ1IK/vboWv/SBxEy88qmhAj0BWKi5c1KVrYpujPpxJ03QzBy2dd9we3Yh28XOObbnda+6qXVVzyWg== -"@spectrum-css/rule@^2.0.6": +"@spectrum-css/rule@^2.0.0", "@spectrum-css/rule@^2.0.6": version "2.0.6" resolved "https://registry.yarnpkg.com/@spectrum-css/rule/-/rule-2.0.6.tgz#1b9743d218af250918313f4f631b74ccf69c5638" integrity sha512-JwZyE/RvsCXUXmGD/SxrSMhoJHUILcYN9b2mLFL2wjiTfyiNsQe7epAkotqLHjr3UO2X8tf6SYLVwev/uZP81A== @@ -6775,15 +6775,6 @@ color-name@^1.0.0, color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -color-parse@^1.3.7: - version "1.3.8" - resolved "https://registry.yarnpkg.com/color-parse/-/color-parse-1.3.8.tgz#eaf54cd385cb34c0681f18c218aca38478082fa3" - integrity sha512-1Y79qFv0n1xair3lNMTNeoFvmc3nirMVBij24zbs1f13+7fPpQClMg5b4AuKXLt3szj7BRlHMCXHplkce6XlmA== - dependencies: - color-name "^1.0.0" - defined "^1.0.0" - is-plain-obj "^1.1.0" - color-string@^1.5.2: version "1.5.3" resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.3.tgz#c9bbc5f01b58b5492f3d6857459cb6590ce204cc" @@ -7978,11 +7969,6 @@ define-property@^2.0.2: is-descriptor "^1.0.2" isobject "^3.0.1" -defined@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693" - integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM= - del@^4.0.0, del@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz#9e8f117222ea44a31ff3a156c049b99052a9f0b4" @@ -16622,15 +16608,6 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^ resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz#651ff4593aa9eda8d5d0d66593a2417aeaeb325d" integrity sha512-N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg== -postcss-values-parser@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/postcss-values-parser/-/postcss-values-parser-1.5.0.tgz#5d9fa63e2bcb0179ce48f3235303765eb89f3047" - integrity sha512-3M3p+2gMp0AH3da530TlX8kiO1nxdTnc3C6vr8dMxRLIlh8UYkz0/wcwptSXjhtx2Fr0TySI7a+BHDQ8NL7LaQ== - dependencies: - flatten "^1.0.2" - indexes-of "^1.0.1" - uniq "^1.0.1" - postcss-values-parser@^2.0.0, postcss-values-parser@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/postcss-values-parser/-/postcss-values-parser-2.0.1.tgz#da8b472d901da1e205b47bdc98637b9e9e550e5f" @@ -16680,7 +16657,7 @@ posthtml-load-options@^1.0.0: dependencies: cosmiconfig "^2.1.0" -posthtml-loader@^1.0.1: +posthtml-loader@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/posthtml-loader/-/posthtml-loader-1.0.2.tgz#afc1fb3f3adbe93bf8fe022fbf6d7dfb65ad53a1" integrity sha512-gOgSoLhBQvdD3iIpu4EWW3AIbMA8Qlkoy5eP33X8lvrbWHQhWZj3Gt1/wuW9wQWsoEYM7aBfsYzt8cUiq1752Q== @@ -16707,28 +16684,6 @@ posthtml-render@^1.1.5: resolved "https://registry.yarnpkg.com/posthtml-render/-/posthtml-render-1.2.0.tgz#3df0c800a8bbb95af583a94748520469477addf4" integrity sha512-dQB+hoAKDtnI94RZm/wxBUH9My8OJcXd0uhWmGh2c7tVtQ85A+OS3yCN3LNbFtPz3bViwBJXAeoi+CBGMXM0DA== -posthtml-transform@^1.0.6: - version "1.0.7" - resolved "https://registry.yarnpkg.com/posthtml-transform/-/posthtml-transform-1.0.7.tgz#c564aa03dc3ab427a34335aaad584f4d43724b35" - integrity sha512-ihbO3C1pqjgq94PjgxWyN/S0B+rW3lW3C2o+U0MHYilxDy7zft+u9r+Gk9YT+Nh5DyZyLgWj6Q9H1CR0Z/TPTg== - dependencies: - color-parse "^1.3.7" - loader-utils "^1.1.0" - lodash "^4.17.14" - postcss-values-parser "^1.5.0" - posthtml "^0.11.3" - posthtml-match-helper "^1.0.1" - slashes "^1.0.5" - unquote "^1.1.1" - -posthtml@^0.11.3: - version "0.11.6" - resolved "https://registry.yarnpkg.com/posthtml/-/posthtml-0.11.6.tgz#e349d51af7929d0683b9d8c3abd8166beecc90a8" - integrity sha512-C2hrAPzmRdpuL3iH0TDdQ6XCc9M7Dcc3zEW5BLerY65G4tWWszwv6nG/ksi6ul5i2mx22ubdljgktXCtNkydkw== - dependencies: - posthtml-parser "^0.4.1" - posthtml-render "^1.1.5" - posthtml@^0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/posthtml/-/posthtml-0.12.0.tgz#6e2a2fcd774eaed1a419a95c5cc3a92b676a40a6" @@ -18793,11 +18748,6 @@ slash@^3.0.0: resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== -slashes@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/slashes/-/slashes-1.0.5.tgz#204798f6c632014d609b5d89b6a57a7aaf70828d" - integrity sha1-IEeY9sYyAU1gm12JtqV6eq9wgo0= - slice-ansi@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636" @@ -20860,7 +20810,7 @@ unpipe@1.0.0, unpipe@~1.0.0: resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= -unquote@^1.1.0, unquote@^1.1.1, unquote@~1.1.1: +unquote@^1.1.0, unquote@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544" integrity sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=