Browse Source

Fix themes path backslash matching regex group (positive lookahead)

pull/1785/head
jlukic 10 years ago
parent
commit
419ffd8562
3 changed files with 15 additions and 14 deletions
  1. 16
      tasks/config/docs.js
  2. 2
      tasks/config/project/tasks.js
  3. 11
      tasks/docs/serve.js

16
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/'
}

2
tasks/config/project/tasks.js

@ -51,7 +51,7 @@ module.exports = {
}
},
theme: /.*\/themes\/.*?\//mg
theme: /.*\/themes\/.*?(?=\/)/mg
},

11
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;
}
/*--------------

Loading…
Cancel
Save