From 419ffd8562fbc3ce380f313c53e575f486f4a4ca Mon Sep 17 00:00:00 2001 From: jlukic Date: Fri, 13 Feb 2015 13:50:25 -0500 Subject: [PATCH] Fix themes path backslash matching regex group (positive lookahead) --- tasks/config/docs.js | 16 ++++++++-------- tasks/config/project/tasks.js | 2 +- tasks/docs/serve.js | 11 ++++++----- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/tasks/config/docs.js b/tasks/config/docs.js index 95a2ebc5d..23e53bec3 100644 --- a/tasks/config/docs.js +++ b/tasks/config/docs.js @@ -8,16 +8,16 @@ module.exports = { paths: { source: { config : 'src/theme.config', - definitions : 'src/definitions', - site : 'src/site', - themes : 'src/themes' + definitions : 'src/definitions/', + site : 'src/site/', + themes : 'src/themes/' }, output: { - less : '../docs/out/src', - packaged : '../docs/out/dist', - uncompressed : '../docs/out/dist/components', - compressed : '../docs/out/dist/components', - themes : '../docs/out/dist/themes' + less : '../docs/out/src/', + packaged : '../docs/out/dist/', + uncompressed : '../docs/out/dist/components/', + compressed : '../docs/out/dist/components/', + themes : '../docs/out/dist/themes/' }, clean: '../docs/out/dist/' } diff --git a/tasks/config/project/tasks.js b/tasks/config/project/tasks.js index fe8d53856..7d6c08af4 100644 --- a/tasks/config/project/tasks.js +++ b/tasks/config/project/tasks.js @@ -51,7 +51,7 @@ module.exports = { } }, - theme: /.*\/themes\/.*?\//mg + theme: /.*\/themes\/.*?(?=\/)/mg }, diff --git a/tasks/docs/serve.js b/tasks/docs/serve.js index 4405383c0..35c78b59a 100644 --- a/tasks/docs/serve.js +++ b/tasks/docs/serve.js @@ -111,7 +111,7 @@ module.exports = function () { ---------------*/ // recompile on *.override , *.variable change - isConfig = (file.path.indexOf('.config') !== -1); + isConfig = (file.path.indexOf('theme.config') !== -1); isPackagedTheme = (file.path.indexOf(source.themes) !== -1); isSiteTheme = (file.path.indexOf(source.site) !== -1); isDefinition = (file.path.indexOf(source.definitions) !== -1); @@ -119,21 +119,22 @@ module.exports = function () { if(isConfig) { console.log('Change detected in theme config'); - gulp.start('build-docs'); + // impossible to tell which file was updated in theme.config, rebuild all + gulp.start('build'); } else if(isPackagedTheme) { console.log('Change detected in packaged theme'); - lessPath = lessPath.replace(tasks.regExp.theme, source.definitions); lessPath = util.replaceExtension(file.path, '.less'); + lessPath = lessPath.replace(tasks.regExp.theme, source.definitions); } else if(isSiteTheme) { console.log('Change detected in site theme'); - lessPath = lessPath.replace(source.site, source.definitions); lessPath = util.replaceExtension(file.path, '.less'); + lessPath = lessPath.replace(source.site, source.definitions); } else if(isDefinition) { console.log('Change detected in definition'); - lessPath = util.replaceExtension(file.path, '.less'); + lessPath = file.path; } /*--------------