better tracking of SASS_STYLE

Author: ryankshaw

src/cache.js

@@ -1,7 +1,8 @@
 const debug = require('debug')('canvas_css')
 import _ from 'lodash'
 import {readJsonSync} from './utils'
-import {paths as PATHS} from "./config"
+import {paths as PATHS} from './config'
+import SASS_STYLE from './sass_style'
 const outputJson = require('bluebird').promisify(require('fs-extra').outputJson)
 
 const caches = ['file_checksums', 'bundles_with_deps']
@@ -15,7 +16,7 @@ let cache = {
 function initCache(name) {
   const filename = PATHS[name]
   let self = {
-    data: readJsonSync(filename),
+    data: readJsonSync(filename + SASS_STYLE),
     isSaved: false,
 
     update(key, value) {

src/compile-bundle.js

@@ -11,6 +11,7 @@ import autoprefixer from 'autoprefixer'
 import postcssUrl from 'postcss-url'
 import {paths as PATHS} from "./config"
 import {BRANDABLE_VARIANTS} from './variants'
+import SASS_STYLE from './sass_style'
 import {fileChecksumSync} from './checksum'
 import supportedBrowsers from './browser-support'
 import cache from './cache'
@@ -71,9 +72,8 @@ export default async function compileSingleBundle ({bundleName, variant, brandId
   const nodeSassResult = await sassRender({
     file: sassFile,
     includePaths: includePaths,
-    // if you want compressed output (eg: in production), set the environment variable  CANVAS_SASS_STYLE=compressed
-    outputStyle: process.env.CANVAS_SASS_STYLE || 'nested',
-    sourceComments: process.env.CANVAS_SASS_STYLE !== 'compressed',
+    outputStyle: SASS_STYLE,
+    sourceComments: SASS_STYLE !== 'compressed',
     sourceMap: false
   })
 

src/sass_style.js

@@ -0,0 +1,6 @@
+// If you want compressed output (eg: in production), set the environment
+// variable SASS_STYLE=compressed. For rails apps, we'll fall back to a sane
+// default of using "compressed" if RAILS_ENV == production
+export default const SASS_STYLE = process.env.SASS_STYLE || 
+                                  (process.env.RAILS_ENV == 'production' ? 'compressed' : 'nested')
+