From 70eeb90f745c2cc9d38a1510757c2254cc9bddb8 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Sun, 28 May 2017 03:32:47 +0200 Subject: [PATCH] add includePaths --- _src/_assets/js/_search.js | 2 +- _src/_assets/js/_tooltips.js | 2 +- _src/_assets/js/kremalicious3.js | 10 +++++----- gulpfile.babel.js | 4 +++- package.json | 10 +++++----- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/_src/_assets/js/_search.js b/_src/_assets/js/_search.js index 8c93d333..db37c74e 100644 --- a/_src/_assets/js/_search.js +++ b/_src/_assets/js/_search.js @@ -1,5 +1,5 @@ -//=require ../../../node_modules/simple-jekyll-search/dest/jekyll-search.js +//=require simple-jekyll-search/dest/jekyll-search.js var Search = (function(w, d) { diff --git a/_src/_assets/js/_tooltips.js b/_src/_assets/js/_tooltips.js index 96976943..5199cfef 100644 --- a/_src/_assets/js/_tooltips.js +++ b/_src/_assets/js/_tooltips.js @@ -1,5 +1,5 @@ -//=require ../../../node_modules/bootstrap/js/tooltip.js +//=require bootstrap/js/tooltip.js var Tooltips = (function(w, d) { diff --git a/_src/_assets/js/kremalicious3.js b/_src/_assets/js/kremalicious3.js index 1bddcbac..918b7945 100644 --- a/_src/_assets/js/kremalicious3.js +++ b/_src/_assets/js/kremalicious3.js @@ -1,9 +1,9 @@ -//=require ../../../node_modules/webcomponents.js/CustomElements.js -//=require ../../../node_modules/svg4everybody/dist/svg4everybody.js -//=require ../../../node_modules/jquery/dist/jquery.js -//=require ../../../bower_components/time-elements/time-elements.js -//=require ../../../node_modules/vex-js/dist/js/vex.combined.js +//=require webcomponents.js/CustomElements.js +//=require svg4everybody/dist/svg4everybody.js +//=require jquery/dist/jquery.js +//=require time-elements/time-elements.js +//=require vex-js/dist/js/vex.combined.js // // include modules diff --git a/gulpfile.babel.js b/gulpfile.babel.js index be998310..09e00d37 100644 --- a/gulpfile.babel.js +++ b/gulpfile.babel.js @@ -225,7 +225,9 @@ const jsProject = () => 'node_modules/picturefill/dist/picturefill.js' ]) .pipe($.sourcemaps.init()) - .pipe($.include()).on('error', onError) + .pipe($.include({ + includePaths: ['node_modules', SRC + '/_assets/js'] + })).on('error', onError) .pipe($.if(isProduction, $.uglify())).on('error', onError) .pipe($.if(!isProduction, $.sourcemaps.write())) .pipe($.if(isProduction, $.header(BANNER, { pkg: pkg }))) diff --git a/package.json b/package.json index f66137ce..11b08744 100644 --- a/package.json +++ b/package.json @@ -27,14 +27,14 @@ }, "devDependencies": { "autoprefixer": ">=6.3.6", - "babel-core": "^6.24.0", - "babel-preset-es2015": "^6.24.0", + "babel-core": ">=6.24.0", + "babel-preset-es2015": ">=6.24.0", "browser-sync": ">=2.10.0", "concurrent-transform": ">=1.0.0", "critical": ">=0.8.4", "cssnano": ">=3.6.2", "del": ">=1.2.0", - "fs": "0.0.1-security", + "fs": ">=0.0.1-security", "gulp": "github:gulpjs/gulp#4.0", "gulp-awspublish": ">=2.0.2", "gulp-awspublish-router": ">=0.1.1", @@ -56,8 +56,8 @@ "gulp-svg-sprite": ">=1.2.2", "gulp-uglify": ">=1.2.0", "gulp-util": ">=3.0.6", - "js-yaml": "^3.8.3", - "request": "^2.81.0" + "js-yaml": ">=3.8.3", + "request": ">=2.81.0" }, "engines": { "node": ">=5.0.0"