Skip to content

Commit c2683e6

Browse files
committed
chore: merge feature/uikit-refactor--batched-updates into dev
2 parents d97b45a + 0ae22a9 commit c2683e6

File tree

101 files changed

+4324
-1853
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+4324
-1853
lines changed

.eslintrc.json

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
{
2+
"root": true,
3+
"env": {
4+
"node": true,
5+
"builtin": true,
6+
"es6": true
7+
},
8+
"parserOptions": {
9+
"ecmaVersion": 2017,
10+
"sourceType": "module"
11+
},
12+
"globals": {},
13+
"extends": ["prettier"],
14+
"plugins": ["prettier"],
15+
"rules": {
16+
"prettier/prettier": "error",
17+
"block-scoped-var": 0,
18+
"camelcase": 0,
19+
"consistent-return": 2,
20+
"curly": [2, "all"],
21+
"dot-notation": [1, { "allowKeywords": true }],
22+
"eqeqeq": [2, "allow-null"],
23+
"global-strict": [0, "never"],
24+
"guard-for-in": 2,
25+
"key-spacing": 0,
26+
"new-cap": 0,
27+
"no-alert": 2,
28+
"no-bitwise": 2,
29+
"no-caller": 2,
30+
"no-cond-assign": [2, "except-parens"],
31+
"no-debugger": 2,
32+
"no-dupe-args": 2,
33+
"no-dupe-keys": 2,
34+
"no-empty": 2,
35+
"no-eval": 2,
36+
"no-extend-native": 2,
37+
"no-extra-bind": 2,
38+
"no-extra-parens": 0,
39+
"no-func-assign": 2,
40+
"no-implied-eval": 2,
41+
"no-invalid-regexp": 2,
42+
"no-irregular-whitespace": 1,
43+
"no-iterator": 2,
44+
"no-loop-func": 2,
45+
"no-mixed-requires": 0,
46+
"no-multi-str": 2,
47+
"no-native-reassign": 2,
48+
"no-new": 2,
49+
"no-param-reassign": 1,
50+
"no-proto": 2,
51+
"no-redeclare": 0,
52+
"no-script-url": 2,
53+
"no-self-assign": 2,
54+
"no-self-compare": 2,
55+
"no-sequences": 2,
56+
"no-shadow": 2,
57+
"no-undef": 2,
58+
"no-underscore-dangle": 0,
59+
"no-unreachable": 1,
60+
"no-unused-vars": 1,
61+
"no-use-before-define": 1,
62+
"no-useless-call": 2,
63+
"no-useless-concat": 2,
64+
"no-var": 2,
65+
"no-with": 2,
66+
"quotes": [0, "single"],
67+
"radix": 2,
68+
"strict": 0,
69+
"valid-typeof": 2,
70+
"vars-on-top": 0,
71+
"prefer-const": [
72+
"error",
73+
{
74+
"destructuring": "any",
75+
"ignoreReadBeforeAssign": false
76+
}
77+
]
78+
}
79+
}

.travis.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
language: node_js
22

3+
addons:
4+
chrome: stable
5+
36
before_install:
47
- phantomjs --version
58

@@ -13,6 +16,8 @@ before_script:
1316
- lerna add @pattern-lab/engine-twig --scope=@pattern-lab/core
1417
- lerna add @pattern-lab/engine-react --scope=@pattern-lab/core
1518

19+
script: travis_wait npm run test
20+
1621
branches:
1722
only:
1823
- master
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
module.exports = {
2+
buildDir: __dirname + '/public',
3+
wwwDir: __dirname + '/public/',
4+
publicPath: '/public/styleguide/',
5+
};

packages/edition-twig/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
],
1414
"main": "patternlab-config.json",
1515
"scripts": {
16+
"build:uikit": "npm run build --prefix node_modules/@pattern-lab/uikit-workshop -- --patternlabrc $INIT_CWD/.patternlabrc.js",
1617
"build": "patternlab build --config ./patternlab-config.json",
1718
"help": "patternlab --help",
1819
"install": "patternlab install --config ./patternlab-config.json",
Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
1-
<!doctype html> <html class="pl-c-html"> <head> <title id="title">Pattern Lab</title> <meta charset="UTF-8"> <meta name="viewport" content="initial-scale=1,width=device-width,viewport-fit=cover"> <meta name="theme-color" content="#ababab"> <style>
2-
.pl-c-body *{-webkit-box-sizing:border-box;box-sizing:border-box}.pl-c-html{min-height:100%}.pl-c-body{margin:0;padding:0;-webkit-text-size-adjust:100%;display:-webkit-box;display:-ms-flexbox;display:flex}pl-header{position:fixed;position:-webkit-sticky;position:sticky;top:0;left:0;z-index:4;display:-webkit-box;display:-ms-flexbox;display:flex;width:100%;background-color:#000;color:grey}pl-layout{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;width:100%;min-height:100vh;max-width:100vw;background-color:#ddd}@media all and (-ms-high-contrast:none),(-ms-high-contrast:active){pl-layout{overflow:hidden}}pl-iframe{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1}.pl-c-body--theme-sidebar .pl-c-viewport{top:0}.pl-c-viewport-modal-wrapper{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;max-width:100vw;position:relative}
1+
<!DOCTYPE html><html class="pl-c-html"><head> <title id="title">Pattern Lab</title> <meta charset="UTF-8"> <meta name="viewport" content="initial-scale=1,width=device-width,viewport-fit=cover"> <meta name="theme-color" content="#ababab"> <style>
2+
.pl-c-body *{-webkit-box-sizing:border-box;box-sizing:border-box}.pl-c-html{min-height:100%}.pl-c-body{margin:0;padding:0;-webkit-text-size-adjust:100%;display:-webkit-box;display:-ms-flexbox;display:flex}:root{--theme-bg:#161b3c;--theme-primary:#464a6d;--theme-secondary:#161f50;--theme-text:white;--theme-text-rgb:255,255,255;--theme-border:rgba(255, 255, 255, 0.2)}.pl-c-body--theme-light{--theme-bg:white;--theme-secondary:white;--theme-text:#262829;--theme-text-rgb:38,40,41;--theme-primary:white;--theme-border:#ddd}pl-layout{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;width:100%;min-height:100vh;max-width:100vw;background-color:#fff;overflow:initial}@media all and (-ms-high-contrast:none),(-ms-high-contrast:active){pl-layout{overflow:hidden}}pl-logo{max-width:12rem;-ms-flex-item-align:center;align-self:center;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-ms-flex-negative:0;flex-shrink:0;position:relative;z-index:100}.pl-c-logo{width:auto;padding:.5rem;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;color:inherit;text-decoration:none;outline:0;text-transform:lowercase;font-size:1.4rem;font-weight:700;line-height:1;margin:0}.pl-c-logo__img{display:block;height:auto;max-height:2.5rem}.pl-c-body--theme-sidebar .pl-c-viewport{top:0}
33
</style>
4+
<<<<<<< HEAD
45
<link rel="preload" href="styleguide/css/pattern-lab.3562851f.css" media="all" as="style" onload="this.onload=null;this.rel='stylesheet'">
56
<noscript><link rel="stylesheet" href="styleguide/css/pattern-lab.3562851f.css" media="all"></noscript>
67
<script>!function(n){"use strict";n.loadCSS||(n.loadCSS=function(){});var o=loadCSS.relpreload={};if(o.support=function(){var e;try{e=n.document.createElement("link").relList.supports("preload")}catch(t){e=!1}return function(){return e}}(),o.bindMediaToggle=function(t){var e=t.media||"all";function a(){t.addEventListener?t.removeEventListener("load",a):t.attachEvent&&t.detachEvent("onload",a),t.setAttribute("onload",null),t.media=e}t.addEventListener?t.addEventListener("load",a):t.attachEvent&&t.attachEvent("onload",a),setTimeout(function(){t.rel="stylesheet",t.media="only x"}),setTimeout(a,3e3)},o.poly=function(){if(!o.support())for(var t=n.document.getElementsByTagName("link"),e=0;e<t.length;e++){var a=t[e];"preload"!==a.rel||"style"!==a.getAttribute("as")||a.getAttribute("data-loadcss")||(a.setAttribute("data-loadcss",!0),o.bindMediaToggle(a))}},!o.support()){o.poly();var t=n.setInterval(o.poly,500);n.addEventListener?n.addEventListener("load",function(){o.poly(),n.clearInterval(t)}):n.attachEvent&&n.attachEvent("onload",function(){o.poly(),n.clearInterval(t)})}"undefined"!=typeof exports?exports.loadCSS=loadCSS:n.loadCSS=loadCSS}("undefined"!=typeof global?global:this);</script> </head> <body class="pl-c-body"> <pl-layout> <pl-header></pl-header> <div class="pl-c-viewport-modal-wrapper"> <pl-iframe></pl-iframe> <pl-drawer></pl-drawer> </div> </pl-layout> <script type="text/mustache" class="pl-js-panel-template-base"> {{# descBlockExists }} <div class="pl-c-pattern-info__panel pl-c-pattern-info__panel--info pl-js-pattern-info"> {{# isPatternView }} <div class=pl-c-pattern-info__header> <ul class=pl-c-breadcrumb> {{# patternBreadcrumb }} <li class=pl-c-breadcrumb__item>{{ patternType }}</li> {{# patternSubtype }} <li class=pl-c-breadcrumb__item>{{ patternSubtype }}</li> {{/ patternSubtype }} {{/ patternBreadcrumb }} </ul> <h2 class=pl-c-pattern-info__title> {{ patternName }} {{# patternState }} <span class="pl-c-pattern-state pl-c-pattern-state--{{ patternState }}" title="{{ patternState }}"></span> {{/ patternState }} </h2> </div> {{/ isPatternView }} {{# patternDescExists }} <div class="pl-c-pattern-info__description pl-c-text-passage"> {{{ patternDesc }}} {{# patternDescAdditions }} {{{ patternDescAdditions }}} {{/ patternDescAdditions }} </div> {{/ patternDescExists }} {{# lineageExists }} <p class="pl-c-lineage pl-js-lineage"> The <em>{{ patternName }}</em> pattern contains the following patterns: {{# lineage }} <a href='{{ lineagePath }}' class='pl-c-lineage__link pl-js-lineage-link' data-patternpartial='{{ lineagePattern }}'> {{ lineagePattern }} {{# lineageState }}<span class="pl-c-pattern-state pl-c-pattern-state--{{ lineageState }}" title="{{ lineageState }}"/>{{/ lineageState }} </a> {{# hasComma }}, {{/ hasComma }} {{/ lineage }} </p> {{/ lineageExists }} {{# lineageRExists }} <p class=pl-c-lineage> The <em>{{ patternName }}</em> pattern is included in the following patterns: {{# lineageR }} <a href='{{ lineagePath }}' class='pl-c-lineage__link pl-js-lineage-link' data-patternpartial='{{ lineagePattern }}'> {{ lineagePattern }} {{# lineageState }}<span class="pl-c-pattern-state pl-c-pattern-state--{{ lineageState }}" title="{{ lineageState }}"/>{{/ lineageState }} </a> {{# hasComma }}, {{/ hasComma }} {{/ lineageR }} </p> {{/ lineageRExists }} {{# annotationExists }} <div class="pl-c-annotations pl-c-text-passage pl-js-annotations"> <h2 class=pl-c-annotations__title>Annotations</h2> <ol class=pl-c-annotations__list> {{# annotations }} <li class=pl-c-annotations__item> <h3 class=pl-c-annotations__item-title>{{ title }}</h3> <div class=pl-c-annotations__item-body> {{{ comment }}} </div> </li> {{/ annotations }} </ol> </div> {{/ annotationExists }} </div> {{/ descBlockExists }} <div class="pl-c-pattern-info__panel pl-c-pattern-info__panel--code"> <div id="pl-{{ patternPartial }}-tabs" class="pl-c-tabs pl-js-tabs"> <div class=pl-c-tabs__header> <ul class=pl-c-tabs__list> {{# panels }} <li class=pl-c-tabs__list-item> <a class="pl-c-tabs__link pl-js-tab-link" href="#pl-{{ patternPartial }}-{{ id }}-panel" id="pl-{{ patternPartial }}-{{ id }}-tab" data-patternpartial="{{ patternPartial }}" data-panelid="{{ id }}">{{ name }}</a> </li> {{/ panels }} </ul> </div> <div id="pl-{{ patternPartial }}-panels" class=pl-c-tabs__content> {{# panels }} <div id="pl-{{ patternPartial }}-{{ id }}-panel" class="pl-c-tabs__panel pl-js-tab-panel"> <button class="pl-c-code-copy-btn pl-js-code-copy-btn" data-clipboard-target="#pl-{{ patternPartial }}-{{ id }}-panel code">Copy</button> {{{ content }}} </div> {{/ panels }} </div> </div> </div> </script> <script type="text/mustache" id="pl-panel-template-code"> <pre class=language-markup>
78
<code id="pl-code-fill-{{ language }}" class="language-{{ language }}">{{{ code }}}</code>
8-
</pre> </script> <script src="styleguide/data/patternlab-data.js" defer="defer"></script> <script src="annotations/annotations.js" defer="defer"></script> <script src="styleguide/js/patternlab-viewer.js" defer="defer"></script> <script></script> </body> </html>
9+
</pre> </script> <script src="styleguide/data/patternlab-data.js" defer="defer"></script> <script src="annotations/annotations.js" defer="defer"></script> <script src="styleguide/js/patternlab-viewer.js" defer="defer"></script> <script></script> </body> </html>
10+
=======
11+
<link rel="preload" href="styleguide/css/pattern-lab.css" media="all" as="style" onload="this.onload=null;this.rel='stylesheet'">
12+
<noscript><link rel="stylesheet" href="styleguide/css/pattern-lab.css" media="all"></noscript>
13+
<script>!function(n){"use strict";n.loadCSS||(n.loadCSS=function(){});var o=loadCSS.relpreload={};if(o.support=function(){var e;try{e=n.document.createElement("link").relList.supports("preload")}catch(t){e=!1}return function(){return e}}(),o.bindMediaToggle=function(t){var e=t.media||"all";function a(){t.addEventListener?t.removeEventListener("load",a):t.attachEvent&&t.detachEvent("onload",a),t.setAttribute("onload",null),t.media=e}t.addEventListener?t.addEventListener("load",a):t.attachEvent&&t.attachEvent("onload",a),setTimeout(function(){t.rel="stylesheet",t.media="only x"}),setTimeout(a,3e3)},o.poly=function(){if(!o.support())for(var t=n.document.getElementsByTagName("link"),e=0;e<t.length;e++){var a=t[e];"preload"!==a.rel||"style"!==a.getAttribute("as")||a.getAttribute("data-loadcss")||(a.setAttribute("data-loadcss",!0),o.bindMediaToggle(a))}},!o.support()){o.poly();var t=n.setInterval(o.poly,500);n.addEventListener?n.addEventListener("load",function(){o.poly(),n.clearInterval(t)}):n.attachEvent&&n.attachEvent("onload",function(){o.poly(),n.clearInterval(t)})}"undefined"!=typeof exports?exports.loadCSS=loadCSS:n.loadCSS=loadCSS}("undefined"!=typeof global?global:this);</script> <link rel="prefetch" as="image" href="styleguide/images/pattern-lab-logo--on-dark.svg"> <link rel="prefetch" as="image" href="styleguide/images/pattern-lab-logo--on-light.svg"> </head> <body class="pl-c-body"> <pl-layout></pl-layout> <script type="text/mustache" class="pl-js-panel-template-base"> {{# descBlockExists }} <div class="pl-c-pattern-info__panel pl-c-pattern-info__panel--info pl-js-pattern-info"> {{# isPatternView }} <div class=pl-c-pattern-info__header> <ul class=pl-c-breadcrumb> {{# patternBreadcrumb }} <li class=pl-c-breadcrumb__item>{{ patternType }}</li> {{# patternSubtype }} <li class=pl-c-breadcrumb__item>{{ patternSubtype }}</li> {{/ patternSubtype }} {{/ patternBreadcrumb }} </ul> <h2 class=pl-c-pattern-info__title> {{ patternName }} {{# patternState }} <span class="pl-c-pattern-state pl-c-pattern-state--{{ patternState }}" title="{{ patternState }}"></span> {{/ patternState }} </h2> </div> {{/ isPatternView }} {{# patternDescExists }} <div class="pl-c-pattern-info__description pl-c-text-passage"> {{{ patternDesc }}} {{# patternDescAdditions }} {{{ patternDescAdditions }}} {{/ patternDescAdditions }} </div> {{/ patternDescExists }} {{# lineageExists }} <p class="pl-c-lineage pl-js-lineage"> The <em>{{ patternName }}</em> pattern contains the following patterns: {{# lineage }} <a href="{{ lineagePath }}" class="pl-c-lineage__link pl-js-lineage-link" data-patternpartial="{{ lineagePattern }}"> {{ lineagePattern }} {{# lineageState }}<span class="pl-c-pattern-state pl-c-pattern-state--{{ lineageState }}" title="{{ lineageState }}"/>{{/ lineageState }} </a> {{# hasComma }}, {{/ hasComma }} {{/ lineage }} </p> {{/ lineageExists }} {{# lineageRExists }} <p class=pl-c-lineage> The <em>{{ patternName }}</em> pattern is included in the following patterns: {{# lineageR }} <a href="{{ lineagePath }}" class="pl-c-lineage__link pl-js-lineage-link" data-patternpartial="{{ lineagePattern }}"> {{ lineagePattern }} {{# lineageState }}<span class="pl-c-pattern-state pl-c-pattern-state--{{ lineageState }}" title="{{ lineageState }}"/>{{/ lineageState }} </a> {{# hasComma }}, {{/ hasComma }} {{/ lineageR }} </p> {{/ lineageRExists }} {{# annotationExists }} <div class="pl-c-annotations pl-c-text-passage pl-js-annotations"> <h2 class=pl-c-annotations__title>Annotations</h2> <ol class=pl-c-annotations__list> {{# annotations }} <li class=pl-c-annotations__item> <h3 class=pl-c-annotations__item-title>{{ title }}</h3> <div class=pl-c-annotations__item-body> {{{ comment }}} </div> </li> {{/ annotations }} </ol> </div> {{/ annotationExists }} </div> {{/ descBlockExists }} <div class="pl-c-pattern-info__panel pl-c-pattern-info__panel--code"> <div id="pl-{{ patternPartial }}-tabs" class="pl-c-tabs pl-js-tabs"> <div class=pl-c-tabs__header> <ul class=pl-c-tabs__list> {{# panels }} <li class=pl-c-tabs__list-item> <a class="pl-c-tabs__link pl-js-tab-link" href="#pl-{{ patternPartial }}-{{ id }}-panel" id="pl-{{ patternPartial }}-{{ id }}-tab" data-patternpartial="{{ patternPartial }}" data-panelid="{{ id }}">{{ name }}</a> </li> {{/ panels }} </ul> </div> <div id="pl-{{ patternPartial }}-panels" class=pl-c-tabs__content> {{# panels }} <div id="pl-{{ patternPartial }}-{{ id }}-panel" class="pl-c-tabs__panel pl-js-tab-panel"> <button class="pl-c-code-copy-btn pl-js-code-copy-btn" data-clipboard-target="#pl-{{ patternPartial }}-{{ id }}-panel code"> Copy </button> {{{ content }}} </div> {{/ panels }} </div> </div> </div> </script> <script src="styleguide/data/patternlab-data.js" defer="defer"></script> <script src="annotations/annotations.js" defer="defer"></script> <script src="styleguide/js/patternlab-viewer.js" defer="defer"></script> <script></script> </body></html>
14+
>>>>>>> feature/uikit-refactor--batched-updates

packages/uikit-workshop/dist/styleguide/css/pattern-lab.css

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 16 additions & 0 deletions
Loading
Lines changed: 12 additions & 0 deletions
Loading

packages/uikit-workshop/dist/styleguide/js/patternlab-pattern.js

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/uikit-workshop/dist/styleguide/js/patternlab-viewer.js

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)