variable.scss globale taşıyayım derken patlamış önceki committe :/ dü…

…zelttildi
ademilter · Apr 10, 2018 · 91a2223 · 91a2223
1 parent a8b4eca
commit 91a2223
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/build/utils.js b/build/utils.js
@@ -5,9 +5,10 @@ const ExtractTextPlugin = require('extract-text-webpack-plugin')
 const pkg = require('../package.json')
 
 exports.assetsPath = function (_path) {
-  const assetsSubDirectory = process.env.NODE_ENV === 'production'
-    ? config.build.assetsSubDirectory
-    : config.dev.assetsSubDirectory
+  const assetsSubDirectory =
+    process.env.NODE_ENV === 'production'
+      ? config.build.assetsSubDirectory
+      : config.dev.assetsSubDirectory
   return path.posix.join(assetsSubDirectory, _path)
 }
 
@@ -29,8 +30,10 @@ exports.cssLoaders = function (options) {
   }
 
   // generate loader string to be used with extract text plugin
-  function generateLoaders (loader, loaderOptions) {
-    const loaders = options.usePostCSS ? [cssLoader, postcssLoader] : [cssLoader]
+  function generateLoaders(loader, loaderOptions) {
+    const loaders = options.usePostCSS
+      ? [cssLoader, postcssLoader]
+      : [cssLoader]
     if (loader) {
       loaders.push({
         loader: loader + '-loader',
@@ -57,8 +60,10 @@ exports.cssLoaders = function (options) {
     css: generateLoaders(),
     postcss: generateLoaders(),
     less: generateLoaders('less'),
-    sass: generateLoaders('sass', { indentedSyntax: true }),
-    scss: generateLoaders('sass'),
+    sass: generateLoaders('sass', {indentedSyntax: true}),
+    scss: generateLoaders('sass', {
+      data: '@import "~@/stylesheet/config/variables";'
+    }),
     stylus: generateLoaders('stylus'),
     styl: generateLoaders('stylus')
   }

diff --git a/build/vue-loader.conf.js b/build/vue-loader.conf.js
@@ -1,6 +1,5 @@
 'use strict'
 const utils = require('./utils')
-const fs = require('fs')
 const config = require('../config')
 const isProduction = process.env.NODE_ENV === 'production'
 const sourceMapEnabled = isProduction
@@ -12,13 +11,6 @@ module.exports = {
     sourceMap: sourceMapEnabled,
     extract: isProduction
   }),
-  css: {
-    loaderOptions: {
-      sass: {
-        data: fs.readFileSync('src/stylesheet/config/variables.scss', 'utf-8')
-      }
-    }
-  },
   cssSourceMap: sourceMapEnabled,
   cacheBusting: config.dev.cacheBusting,
   transformToRequire: {

diff --git a/src/view/pages/Home/index.vue b/src/view/pages/Home/index.vue
@@ -15,5 +15,6 @@
 <style lang="scss">
   .Home {
     padding: 50px;
+    color: $color-primary;
   }
 </style>