From e2065b84e2a30b41c6f48f05f0fc3d42a6040dbf Mon Sep 17 00:00:00 2001 From: hisasann Date: Tue, 19 Mar 2019 18:29:24 +0900 Subject: [PATCH 1/3] chore(package.json): add @nuxtjs/style-resources --- package.json | 1 + yarn.lock | 47 +++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index dba97eb..d18c514 100644 --- a/package.json +++ b/package.json @@ -63,6 +63,7 @@ }, "devDependencies": { "@nuxtjs/eslint-config": "^0.0.1", + "@nuxtjs/style-resources": "^0.1.2", "@storybook/vue": "^4.1.13", "@types/babel-core": "6.25.6", "@types/eslint": "^4.16.6", diff --git a/yarn.lock b/yarn.lock index 91b1d72..5478ffd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1199,6 +1199,15 @@ "@nuxtjs/pwa-utils" "3.0.0-beta.8" "@nuxtjs/workbox" "3.0.0-beta.8" +"@nuxtjs/style-resources@^0.1.2": + version "0.1.2" + resolved "https://registry.yarnpkg.com/@nuxtjs/style-resources/-/style-resources-0.1.2.tgz#6d90637611d3a445158224c34e42ec5769e13aaa" + integrity sha512-hF4kxO3ETHnJlscBOHM/UKasMwrdlODb+y6mv9mnsyn1Ujvp7kMqOmUmhKcemDexXEzpc5eniIOOq+Nul8JAKA== + dependencies: + consola "^2.4.0" + glob-all "^3.1.0" + sass-resources-loader "^2.0.0" + "@nuxtjs/workbox@3.0.0-beta.8": version "3.0.0-beta.8" resolved "https://registry.yarnpkg.com/@nuxtjs/workbox/-/workbox-3.0.0-beta.8.tgz#695dea70bcf46c805826e6bbe7b80d538222799a" @@ -2289,7 +2298,7 @@ async-limiter@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8" -async@^2.3.0, async@^2.5.0, async@^2.6.1: +async@^2.1.4, async@^2.3.0, async@^2.5.0, async@^2.6.1: version "2.6.2" resolved "https://registry.yarnpkg.com/async/-/async-2.6.2.tgz#18330ea7e6e313887f5d2f2a904bac6fe4dd5381" dependencies: @@ -3406,7 +3415,7 @@ consola@^1.4.4: lodash "^4.17.5" std-env "^1.1.0" -consola@^2.0.0-1, consola@^2.3.0, consola@^2.3.2, consola@^2.4.1: +consola@^2.0.0-1, consola@^2.3.0, consola@^2.3.2, consola@^2.4.0, consola@^2.4.1: version "2.5.6" resolved "https://registry.yarnpkg.com/consola/-/consola-2.5.6.tgz#5ce14dbaf6f5b589c8a258ef80ed97b752fa57d5" @@ -5096,6 +5105,14 @@ getpass@^0.1.1: dependencies: assert-plus "^1.0.0" +glob-all@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/glob-all/-/glob-all-3.1.0.tgz#8913ddfb5ee1ac7812656241b03d5217c64b02ab" + integrity sha1-iRPd+17hrHgSZWJBsD1SF8ZLAqs= + dependencies: + glob "^7.0.5" + yargs "~1.2.6" + glob-parent@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" @@ -5107,7 +5124,7 @@ glob-to-regexp@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab" -glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@~7.1.1: +glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@~7.1.1: version "7.1.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1" dependencies: @@ -6673,7 +6690,7 @@ loader-utils@^0.2.16: json5 "^0.5.0" object-assign "^4.0.1" -loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.1: +loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.0.4, loader-utils@^1.1.0, loader-utils@^1.2.1: version "1.2.3" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7" dependencies: @@ -6995,6 +7012,11 @@ minimist@0.0.8: version "0.0.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" +minimist@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.1.0.tgz#99df657a52574c21c9057497df742790b2b4c0de" + integrity sha1-md9lelJXTCHJBXSX33QnkLK0wN4= + minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" @@ -9422,6 +9444,16 @@ sass-loader@^7.1.0: pify "^3.0.0" semver "^5.5.0" +sass-resources-loader@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/sass-resources-loader/-/sass-resources-loader-2.0.0.tgz#88569c542fbf1f18f33a6578b77cc5b36c56911d" + integrity sha512-I+5FfV+Hb29U5Nt8DbslWOBgRmTv1M/EwOn4/4rc6Aqy9yjygoa8UTnyCFXfTZV8FoQyIBZbEyKSBryhByqQbA== + dependencies: + async "^2.1.4" + chalk "^1.1.3" + glob "^7.1.1" + loader-utils "^1.0.4" + sax@>=0.6.0, sax@^1.2.4, sax@~1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" @@ -11203,6 +11235,13 @@ yargs@^7.0.0: y18n "^3.2.1" yargs-parser "^5.0.0" +yargs@~1.2.6: + version "1.2.6" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-1.2.6.tgz#9c7b4a82fd5d595b2bf17ab6dcc43135432fe34b" + integrity sha1-nHtKgv1dWVsr8Xq23MQxNUMv40s= + dependencies: + minimist "^0.1.0" + yargs@~3.10.0: version "3.10.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1" From c73bd3b175005b46f800082215336dd4ecfd6917 Mon Sep 17 00:00:00 2001 From: hisasann Date: Tue, 19 Mar 2019 18:33:51 +0900 Subject: [PATCH 2/3] feat: add styles/components/sample.scss --- nuxt.config.ts | 5 +++++ src/assets/styles/components/sample.scss | 3 +++ 2 files changed, 8 insertions(+) create mode 100644 src/assets/styles/components/sample.scss diff --git a/nuxt.config.ts b/nuxt.config.ts index e363792..cc73e9c 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -61,6 +61,8 @@ module.exports = { // Doc: https://axios.nuxtjs.org/usage '@nuxtjs/axios', '@nuxtjs/pwa', + // https://github.com/nuxt-community/style-resources-module/ + '@nuxtjs/style-resources', // https://github.com/potato4d/nuxt-client-init-module // https://qiita.com/potato4d/items/cc5d8ea24949e86f8a5b 'nuxt-client-init-module', @@ -132,5 +134,8 @@ module.exports = { component: resolve(__dirname, 'src/include/include.vue') }) } + }, + styleResources: { + scss: ['@/assets/styles/components/**/*.scss'] } } diff --git a/src/assets/styles/components/sample.scss b/src/assets/styles/components/sample.scss new file mode 100644 index 0000000..fe57fda --- /dev/null +++ b/src/assets/styles/components/sample.scss @@ -0,0 +1,3 @@ +.color { + color: aqua; +} From f574987aa2dfa6a63f06e67aa07a6ac4162e3c7b Mon Sep 17 00:00:00 2001 From: hisasann Date: Tue, 19 Mar 2019 18:34:40 +0900 Subject: [PATCH 3/3] feat: add pages/example/extend-css-class.vue --- src/pages/example/extend-css-class.vue | 34 ++++++++++++++++++++++++++ src/pages/example/index.vue | 3 +++ 2 files changed, 37 insertions(+) create mode 100644 src/pages/example/extend-css-class.vue diff --git a/src/pages/example/extend-css-class.vue b/src/pages/example/extend-css-class.vue new file mode 100644 index 0000000..043a8ab --- /dev/null +++ b/src/pages/example/extend-css-class.vue @@ -0,0 +1,34 @@ + + + + + diff --git a/src/pages/example/index.vue b/src/pages/example/index.vue index 4a28077..521e8c4 100644 --- a/src/pages/example/index.vue +++ b/src/pages/example/index.vue @@ -44,6 +44,9 @@ p nuxt-link(to='/example/type-safe-vuex') | type-safe-vuex + p + nuxt-link(to='/example/extend-css-class') + | extend-css-class