diff --git a/spig/tasks/sass.js b/spig/tasks/sass.js index a84e99e..8ca4c19 100644 --- a/spig/tasks/sass.js +++ b/spig/tasks/sass.js @@ -13,7 +13,8 @@ const SpigConfig = require('../spig-config'); gulp.task('sass', () => { const dev = SpigConfig.dev; - SpigConfig.site.assets['dir_css'] = dev.dirCssOut; + SpigConfig.site.assets['css'] = {}; + SpigConfig.site.assets.css['dir'] = dev.dirCssOut; return gulp.src([dev.srcDir + dev.dirCss + '/**/*.s?ss']) .pipe(sourcemaps.init()) diff --git a/spig/tasks/scripts.js b/spig/tasks/scripts.js index 3ea8486..aaf5d4c 100644 --- a/spig/tasks/scripts.js +++ b/spig/tasks/scripts.js @@ -14,8 +14,9 @@ const SpigConfig = require('../spig-config'); gulp.task('js', () => { const dev = SpigConfig.dev; - SpigConfig.site.assets['dir_js'] = dev.dirJsOut; - SpigConfig.site.assets['bundle_js'] = dev.dirJsOut + '/' + SpigConfig.dev.names.bundle_js; + SpigConfig.site.assets['js'] = {}; + SpigConfig.site.assets.js['dir'] = dev.dirJsOut; + SpigConfig.site.assets.js['bundle'] = dev.dirJsOut + '/' + SpigConfig.dev.names.bundle_js; return gulp.src([dev.srcDir + dev.dirJs + '/**/*.js']) .pipe(plumber()) diff --git a/src/layouts/base.njk b/src/layouts/base.njk index e2ab476..5263520 100644 --- a/src/layouts/base.njk +++ b/src/layouts/base.njk @@ -3,8 +3,7 @@
- - +