Merge 13e9f01 into abf24d4

pattern-lab · Apr 16, 2019 · 4f1801d · 4f1801d
2 parents abf24d4 + 13e9f01
commit 4f1801d
Show file tree

Hide file tree

Showing 109 changed files with 4,915 additions and 5,011 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -5,7 +5,7 @@
     "es6": true
   },
   "parserOptions": {
-    "ecmaVersion": 6,
+    "ecmaVersion": 2017,
     "sourceType": "module"
   },
   "globals": {},

diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,8 @@
 language: node_js
 
+addons:
+  chrome: stable
+
 before_install:
   - phantomjs --version
 

diff --git a/packages/edition-twig/.patternlabrc.js b/packages/edition-twig/.patternlabrc.js
@@ -0,0 +1,5 @@
+module.exports = {
+  buildDir: __dirname + '/public',
+  wwwDir: __dirname + '/public/',
+  publicPath: '/public/styleguide/',
+};
diff --git a/packages/edition-twig/package.json b/packages/edition-twig/package.json
@@ -13,6 +13,7 @@
   ],
   "main": "patternlab-config.json",
   "scripts": {
+    "build:uikit": "npm run build --prefix node_modules/@pattern-lab/uikit-workshop -- --patternlabrc $INIT_CWD/.patternlabrc.js",
     "build": "patternlab build --config ./patternlab-config.json",
     "help": "patternlab --help",
     "install": "patternlab install --config ./patternlab-config.json",

diff --git a/packages/uikit-workshop/dist/index.html b/packages/uikit-workshop/dist/index.html
diff --git a/packages/uikit-workshop/dist/styleguide/css/pattern-lab.css b/packages/uikit-workshop/dist/styleguide/css/pattern-lab.css
diff --git a/packages/uikit-workshop/dist/styleguide/images/pattern-lab-logo--on-dark.svg b/packages/uikit-workshop/dist/styleguide/images/pattern-lab-logo--on-dark.svg
diff --git a/packages/uikit-workshop/dist/styleguide/images/pattern-lab-logo--on-light.svg b/packages/uikit-workshop/dist/styleguide/images/pattern-lab-logo--on-light.svg
diff --git a/packages/uikit-workshop/dist/styleguide/js/0-chunk-bfab2102075df63da231.js b/packages/uikit-workshop/dist/styleguide/js/0-chunk-bfab2102075df63da231.js
diff --git a/packages/uikit-workshop/dist/styleguide/js/1-chunk-861f2bf3817d7850085a.js b/packages/uikit-workshop/dist/styleguide/js/1-chunk-861f2bf3817d7850085a.js
diff --git a/packages/uikit-workshop/dist/styleguide/js/2-chunk-e309c72e0e8f5783df94.js b/packages/uikit-workshop/dist/styleguide/js/2-chunk-e309c72e0e8f5783df94.js
diff --git a/packages/uikit-workshop/dist/styleguide/js/patternlab-pattern.js b/packages/uikit-workshop/dist/styleguide/js/patternlab-pattern.js
diff --git a/packages/uikit-workshop/dist/styleguide/js/patternlab-viewer.js b/packages/uikit-workshop/dist/styleguide/js/patternlab-viewer.js
diff --git a/packages/uikit-workshop/dist/styleguide/js/pl-modal-viewer-chunk-37ca3c39c5ede5fa4f4c.js b/packages/uikit-workshop/dist/styleguide/js/pl-modal-viewer-chunk-37ca3c39c5ede5fa4f4c.js