IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use new seperate styleguide repo instead of embedded one

Browse Source
This commit is contained in:
Grzegorz Leoniec 2019-02-16 10:32:57 +01:00
parent 0f37fffb2b
commit 43c5f8ac86
No known key found for this signature in database
GPG Key ID: 3AA43686D4EB1377
3 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nuxt.config.js
View File

@ -63,10 +63,10 @@ module.exports = {
** Plugins to load before mounting the App
*/
plugins: [
{ src: '~/plugins/styleguide.js', ssr: true },
{ src: '~/plugins/i18n.js', ssr: true },
{ src: '~/plugins/axios.js', ssr: false },
{ src: '~/plugins/keep-alive.js', ssr: false },
{ src: '~/plugins/design-system.js', ssr: true },
{ src: '~/plugins/vue-directives.js', ssr: false },
{ src: '~/plugins/v-tooltip.js', ssr: false },
{ src: '~/plugins/izi-toast.js', ssr: false },
@ -96,7 +96,7 @@ module.exports = {
],
styleResources: {
scss: ['~/styleguide/src/system/styles/shared.scss']
scss: ['~/node_modules/styleguide/dist/shared.scss']
},
/*
@ -173,14 +173,6 @@ module.exports = {
exclude: /(node_modules)/
})
}
config.resolve.alias['@@'] = path.resolve(
__dirname,
'./styleguide/src/system'
)
config.module.rules.push({
resourceQuery: /blockType=docs/,
loader: require.resolve('./styleguide/src/loader/docs-trim-loader.js')
})
const svgRule = config.module.rules.find(rule => rule.test.test('.svg'))
svgRule.test = /\.(png|jpe?g|gif|webp)$/
config.module.rules.push({

11
package.json
View File

@ -10,8 +10,8 @@
"start": "cross-env node server/index.js",
"generate": "nuxt generate",
"lint": "eslint --ext .js,.vue .",
"styleguide": "cd ./styleguide && yarn dev",
"styleguide:build": "cd ./styleguide && yarn build:lib && cd ../",
"styleguide": "cd ./node_modules/styleguide && yarn dev",
"styleguide:build": "echo 'STOP DOING IT!'",
"test": "jest",
"precommit": "yarn lint"
},
@ -30,12 +30,8 @@
},
"moduleNameMapper": {
"^@/(.*)$": "<rootDir>/src/$1",
"^@@/(.*)$": "<rootDir>/styleguide/src/system/$1",
"^~/(.*)$": "<rootDir>/$1"
},
"modulePathIgnorePatterns": [
"<rootDir>/styleguide"
]
}
},
"dependencies": {
"@nuxtjs/apollo": "4.0.0-rc4",
@ -54,6 +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#fix-missing-files",
"v-tooltip": "~2.0.0-rc.33",
"vue-count-to": "~1.0.13",
"vue-izitoast": "1.1.2",

9
yarn.lock
View File

@ -10624,6 +10624,13 @@ 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#fix-missing-files":
version "1.0.0"
resolved "git+https://github.com/Human-Connection/Nitro-Styleguide.git#e767ee5870e833fc3fce43ca824121eef6fb1029"
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"
@ -11547,7 +11554,7 @@ 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.5.22, vue@~2.6.6:
version "2.6.6"
resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.6.tgz#dde41e483c11c46a7bf523909f4f2f816ab60d25"
integrity sha512-Y2DdOZD8sxApS+iUlwv1v8U1qN41kq6Kw45lM6nVZKhygeWA49q7VCCXkjXqeDBXgurrKWkYQ9cJeEJwAq0b9Q==