From 5d4824c86f85f6ba0e7221e751d3ee98976bcda6 Mon Sep 17 00:00:00 2001 From: Grzegorz Leoniec Date: Tue, 26 Feb 2019 08:34:30 +0100 Subject: [PATCH] Use new styleguide npm package --- nuxt.config.js | 2 +- package.json | 2 +- plugins/styleguide.js | 6 +++--- yarn.lock | 22 ++++++++++++++-------- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/nuxt.config.js b/nuxt.config.js index 25d9d4d73..fba8d65a6 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -96,7 +96,7 @@ module.exports = { ], styleResources: { - scss: ['~/node_modules/styleguide/dist/shared.scss'] + scss: ['@human-connection/styleguide/dist/shared.scss'] }, /* diff --git a/package.json b/package.json index 1cfcb18b2..dfdda5e2f 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "nuxt": "~2.4.3", "nuxt-env": "~0.1.0", "portal-vue": "~1.5.1", - "styleguide": "git+https://github.com/Human-Connection/Nitro-Styleguide.git", + "@human-connection/styleguide": "~0.5.0", "v-tooltip": "~2.0.0-rc.33", "vue-count-to": "~1.0.13", "vue-izitoast": "1.1.2", diff --git a/plugins/styleguide.js b/plugins/styleguide.js index 03507374e..788d5dcc7 100644 --- a/plugins/styleguide.js +++ b/plugins/styleguide.js @@ -1,6 +1,6 @@ import Vue from 'vue' -import Styleguide from 'styleguide' -import 'styleguide/dist/system.css' -// import 'styleguide/dist/shared.scss' +import Styleguide from '@human-connection/styleguide' +import '@human-connection/styleguide/dist/system.css' +// import '@human-connection/styleguide/dist/shared.scss' Vue.use(Styleguide) diff --git a/yarn.lock b/yarn.lock index ccc32b6d5..b88b8c927 100644 --- a/yarn.lock +++ b/yarn.lock @@ -866,6 +866,14 @@ fs-extra "7.0.0" watchify "3.11.0" +"@human-connection/styleguide@~0.5.0": + version "0.5.0" + resolved "https://registry.yarnpkg.com/@human-connection/styleguide/-/styleguide-0.5.0.tgz#14d5f696461996708b25126dc1e9e900c3a841cf" + integrity sha512-xR8iqGnjxGABoSI3AIq2R9YibZi4TTIe5R6/A9cEbWo3XqD/82+tNBjyKhv84Op4KJTgedR6IJtIIOh3H0aeOg== + dependencies: + portal-vue "~1.5.1" + vue "~2.6.7" + "@nuxt/babel-preset-app@2.4.3": version "2.4.3" resolved "https://registry.yarnpkg.com/@nuxt/babel-preset-app/-/babel-preset-app-2.4.3.tgz#5204dc1e533175f1566d206f32ccdd90477f3908" @@ -10623,13 +10631,6 @@ style-resources-loader@^1.2.1: is-promise "^2.1.0" loader-utils "^1.1.0" -"styleguide@git+https://github.com/Human-Connection/Nitro-Styleguide.git": - version "1.0.0" - resolved "git+https://github.com/Human-Connection/Nitro-Styleguide.git#c141674c65ad941409745e251d0816f94961444f" - dependencies: - portal-vue "~1.5.1" - vue "~2.6.6" - stylehacks@^4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-4.0.3.tgz#6718fcaf4d1e07d8a1318690881e8d96726a71d5" @@ -11553,11 +11554,16 @@ vue-template-es2015-compiler@^1.6.0, vue-template-es2015-compiler@^1.8.2: resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.8.2.tgz#dd73e80ba58bb65dd7a8aa2aeef6089cf6116f2a" integrity sha512-cliV19VHLJqFUYbz/XeWXe5CO6guzwd0yrrqqp0bmjlMP3ZZULY7fu8RTC4+3lmHwo6ESVDHFDsvjB15hcR5IA== -vue@^2.5.22, vue@~2.6.6: +vue@^2.5.22: version "2.6.6" resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.6.tgz#dde41e483c11c46a7bf523909f4f2f816ab60d25" integrity sha512-Y2DdOZD8sxApS+iUlwv1v8U1qN41kq6Kw45lM6nVZKhygeWA49q7VCCXkjXqeDBXgurrKWkYQ9cJeEJwAq0b9Q== +vue@~2.6.7: + version "2.6.7" + resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.7.tgz#254f188e7621d2d19ee28d0c0442c6d21b53ae2d" + integrity sha512-g7ADfQ82QU+j6F/bVDioVQf2ccIMYLuR4E8ev+RsDBlmwRkhGO3HhgF4PF9vpwjdPpxyb1zzLur2nQ2oIMAMEg== + vuex-i18n@~1.11.0: version "1.11.0" resolved "https://registry.yarnpkg.com/vuex-i18n/-/vuex-i18n-1.11.0.tgz#e6cdc95080c445ab2c211cc6b64a907d217639d3"