From 626afe4e0dd06e814dd3471493f2c0f4647b896a Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 13 Apr 2015 16:23:26 -0700 Subject: [PATCH 1/2] Don't include fallback imports for static files --- build/tasks/prebuild-less-task.coffee | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/build/tasks/prebuild-less-task.coffee b/build/tasks/prebuild-less-task.coffee index 18a323403..755003455 100644 --- a/build/tasks/prebuild-less-task.coffee +++ b/build/tasks/prebuild-less-task.coffee @@ -20,6 +20,9 @@ module.exports = (grunt) -> rm(bootstrapLessPath) rm(path.join(appDir, 'node_modules', 'bootstrap', 'less')) + importFallbackVariables = (lessFilePath) -> + lessFilePath.indexOf('static') isnt 0 + grunt.registerMultiTask 'prebuild-less', 'Prebuild cached of compiled Less files', -> compileBootstrap() @@ -82,12 +85,14 @@ module.exports = (grunt) -> importPaths: importPaths cssForFile = (file) -> - baseVarImports = """ - @import "variables/ui-variables"; - @import "variables/syntax-variables"; - """ less = fs.readFileSync(file, 'utf8') - lessCache.cssForFile(file, [baseVarImports, less].join('\n')) + if importFallbackVariables(file) + baseVarImports = """ + @import "variables/ui-variables"; + @import "variables/syntax-variables"; + """ + less = [baseVarImports, less].join('\n') + lessCache.cssForFile(file, less) for file in @filesSrc grunt.verbose.writeln("File #{file.cyan} created in cache.") From 930f30647631c07ec4c47b02d374c18a3706c170 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 13 Apr 2015 16:45:48 -0700 Subject: [PATCH 2/2] Precompile atom-space-pen-views stylesheets --- build/Gruntfile.coffee | 1 + build/tasks/prebuild-less-task.coffee | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/build/Gruntfile.coffee b/build/Gruntfile.coffee index e4ebf3e9a..dac5c8f1f 100644 --- a/build/Gruntfile.coffee +++ b/build/Gruntfile.coffee @@ -92,6 +92,7 @@ module.exports = (grunt) -> prebuildLessConfig = src: [ 'static/**/*.less' + 'node_modules/atom-space-pen-views/stylesheets/**/*.less' ] csonConfig = diff --git a/build/tasks/prebuild-less-task.coffee b/build/tasks/prebuild-less-task.coffee index 755003455..5e3bd274e 100644 --- a/build/tasks/prebuild-less-task.coffee +++ b/build/tasks/prebuild-less-task.coffee @@ -21,7 +21,12 @@ module.exports = (grunt) -> rm(path.join(appDir, 'node_modules', 'bootstrap', 'less')) importFallbackVariables = (lessFilePath) -> - lessFilePath.indexOf('static') isnt 0 + if lessFilePath.indexOf('static') is 0 + false + else if lessFilePath.indexOf('atom-space-pen-views') isnt -1 + false + else + true grunt.registerMultiTask 'prebuild-less', 'Prebuild cached of compiled Less files', -> compileBootstrap()