From 208751602a134619afe9bffa9f34c28f9c82845a Mon Sep 17 00:00:00 2001 From: Grzegorz Leoniec Date: Fri, 23 Nov 2018 10:00:34 +0100 Subject: [PATCH 1/3] fixed issue with styleguide --- styleguide/.prettierrc | 4 +++- styleguide/package.json | 2 +- yarn.lock | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/styleguide/.prettierrc b/styleguide/.prettierrc index b2095be81..7dc4f8263 100644 --- a/styleguide/.prettierrc +++ b/styleguide/.prettierrc @@ -1,4 +1,6 @@ { "semi": false, - "singleQuote": true + "singleQuote": true, + "tabWidth": 2, + "bracketSpacing": true } diff --git a/styleguide/package.json b/styleguide/package.json index 142a197ed..45e62edf7 100644 --- a/styleguide/package.json +++ b/styleguide/package.json @@ -56,7 +56,7 @@ "vue-router": "^3.0.1", "vue-svg-loader": "^0.8.0", "vue-template-compiler": "^2.5.17", - "vuep": "^0.8.1", + "vuep": "git://github.com/visualjerk/vuep.git#fix-iframe-firefox", "webpack-bundle-analyzer": "^2.13.1", "webpack-merge-and-include-globally": "^2.0.11" }, diff --git a/yarn.lock b/yarn.lock index 328b2d5fe..b7ee774c4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9470,6 +9470,7 @@ vue-template-es2015-compiler@^1.6.0: vue@^2.5.17: version "2.5.17" resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.17.tgz#0f8789ad718be68ca1872629832ed533589c6ada" + integrity sha512-mFbcWoDIJi0w0Za4emyLiW72Jae0yjANHbCVquMKijcavBGypqlF7zHRgMa5k4sesdv7hv2rB4JPdZfR+TPfhQ== vuex@^3.0.1: version "3.0.1" From a0634d3d87958fb48c3dffccd4f6ee28dffca10f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Fri, 23 Nov 2018 13:40:01 +0100 Subject: [PATCH 2/3] Yarn install in styleguide/, fix container build --- styleguide/yarn.lock | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/styleguide/yarn.lock b/styleguide/yarn.lock index 70eae6a97..6d396a01c 100644 --- a/styleguide/yarn.lock +++ b/styleguide/yarn.lock @@ -9460,10 +9460,9 @@ vue@^2.4.2, vue@^2.5.17: version "2.5.17" resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.17.tgz#0f8789ad718be68ca1872629832ed533589c6ada" -vuep@^0.8.1: +"vuep@git://github.com/visualjerk/vuep.git#fix-iframe-firefox": version "0.8.1" - resolved "https://registry.yarnpkg.com/vuep/-/vuep-0.8.1.tgz#949b455f375788fbd7d1c35ca495a0faa5d5502f" - integrity sha512-D4ClmdZ37Itb57KdW9FPqE5820ENAFuJFmc7KyzGfoGBDhVHYxgF/pUbeTjpGe4VF0u2lGQVItfZ1xlh9nMpWg== + resolved "git://github.com/visualjerk/vuep.git#df765f9bce3d96f79ffc35e75ec2885539bf9baa" dependencies: simple-assign "^0.1.0" From 107a8ada143af14b13e714fd2ef87f13b3261829 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Fri, 23 Nov 2018 14:06:12 +0100 Subject: [PATCH 3/3] Add missing styleguid:build and fix css import --- Dockerfile | 1 + README.md | 1 + 2 files changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index d0d0e28dd..9cee1fa94 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,6 +16,7 @@ RUN cd styleguide && yarn install --production=false --frozen-lockfile --non-int COPY package.json . COPY yarn.lock . +RUN yarn run styleguide:build RUN yarn install --production=false --frozen-lockfile --non-interactive --ignore-engines COPY . . diff --git a/README.md b/README.md index 41ec07c5b..e57de2edd 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,7 @@ # NOTE: currently we need the --ignore-engines parameter as one package is an idiot and dont like new node versions # install all dependencies $ cd styleguide && yarn install --ignore-engines && cd .. +$ yarn run styleguide:build $ yarn install --ignore-engines ```